Author: sevein
Date: Thu May 3 17:35:24 2012
New Revision: 11624
Log:
Merge listAction functionality in browseAction, remove listAction
Deleted:
branches/2.0/apps/qubit/modules/actor/actions/listAction.class.php
branches/2.0/apps/qubit/modules/actor/templates/listSuccess.php
Modified:
branches/2.0/apps/qubit/modules/actor/actions/browseAction.class.php
branches/2.0/apps/qubit/modules/actor/config/view.yml
branches/2.0/apps/qubit/modules/actor/templates/browseSuccess.php
Modified: branches/2.0/apps/qubit/modules/actor/actions/browseAction.class.php
==============================================================================
--- branches/2.0/apps/qubit/modules/actor/actions/browseAction.class.php
Thu May 3 16:51:59 2012 (r11623)
+++ branches/2.0/apps/qubit/modules/actor/actions/browseAction.class.php
Thu May 3 17:35:24 2012 (r11624)
@@ -36,6 +36,9 @@
public function execute($request)
{
+ // TODO
+ // ??? $query = QubitAcl::searchFilterByResource($query,
QubitActor::getById(QubitActor::ROOT_ID));
+
if (!isset($request->limit))
{
$request->limit = sfConfig::get('app_hits_per_page');
@@ -51,7 +54,17 @@
}
$queryBool = new Elastica_Query_Bool();
- $queryBool->addMust(new Elastica_Query_MatchAll());
+
+ if ('' == preg_replace('/[\s\t\r\n]*/', '', $request->subquery))
+ {
+ $queryBool->addMust(new Elastica_Query_MatchAll());
+ }
+ else
+ {
+ $queryText = new Elastica_Query_QueryString($request->subquery);
+ $queryText->setDefaultOperator('AND');
+ $queryBool->addMust($queryText);
+ }
$this->filters = array();
foreach ($this->request->getGetParameters() as $param => $value)
Modified: branches/2.0/apps/qubit/modules/actor/config/view.yml
==============================================================================
--- branches/2.0/apps/qubit/modules/actor/config/view.yml Thu May 3
16:51:59 2012 (r11623)
+++ branches/2.0/apps/qubit/modules/actor/config/view.yml Thu May 3
17:35:24 2012 (r11624)
@@ -2,8 +2,3 @@
javascripts:
/plugins/sfDrupalPlugin/vendor/drupal/misc/jquery.once.js:
/plugins/sfDrupalPlugin/vendor/drupal/misc/tableheader:
-
-listSuccess:
- javascripts:
- /plugins/sfDrupalPlugin/vendor/drupal/misc/jquery.once.js:
- /plugins/sfDrupalPlugin/vendor/drupal/misc/tableheader:
Modified: branches/2.0/apps/qubit/modules/actor/templates/browseSuccess.php
==============================================================================
--- branches/2.0/apps/qubit/modules/actor/templates/browseSuccess.php Thu May
3 16:51:59 2012 (r11623)
+++ branches/2.0/apps/qubit/modules/actor/templates/browseSuccess.php Thu May
3 17:35:24 2012 (r11624)
@@ -28,6 +28,13 @@
<div class="span9" id="main-column">
+ <div class="search">
+ <form action="<?php echo url_for(array('module' => 'actor', 'action' =>
'browse') + $sf_request->getParameterHolder()->getAll()) ?>">
+ <input name="subquery" value="<?php echo
esc_entities($sf_request->subquery) ?>" placeholder="<?php echo __('Search
%1%', array('%1%' => sfConfig::get('app_ui_label_actor'))) ?>"/>
+ <input class="form-submit" type="submit" value="<?php echo __('Search
%1%', array('%1%' => sfConfig::get('app_ui_label_actor'))) ?>"/>
+ </form>
+ </div>
+
<ul class="nav nav-tabs">
<?php if ('lastUpdated' == $sortSetting): ?>
<li<?php if ('nameDown' != $sf_request->sort && 'nameUp' !=
$sf_request->sort): ?> class="active"<?php endif; ?>><?php echo
link_to(__('Recent changes'), array('sort' => 'updatedDown') +
$sf_request->getParameterHolder()->getAll(), array('title' => __('Sort')))
?></li>
@@ -36,6 +43,8 @@
<li<?php if ('updatedDown' == $sf_request->sort || 'updatedUp' ==
$sf_request->sort): ?> class="active"<?php endif; ?>><?php echo
link_to(__('Recent changes'), array('sort' => 'updatedDown') +
$sf_request->getParameterHolder()->getAll(), array('title' => __('Sort')))
?></li>
<li<?php if ('updatedDown' != $sf_request->sort && 'updatedUp' !=
$sf_request->sort): ?> class="active"<?php endif; ?>><?php echo
link_to(__('Alphabetic'), array('sort' => 'nameUp') +
$sf_request->getParameterHolder()->getAll(), array('title' => __('Sort')))
?></li>
<?php endif; ?>
+ <li class="pull-right">
+ </li>
</ul>
<div id="content">
@@ -103,12 +112,3 @@
</div>
</div>
-
-<!--
-<div class="search">
- <form action="<?php echo url_for(array('module' => 'actor', 'action' =>
'list')) ?>">
- <input name="subquery" value="<?php echo
esc_entities($sf_request->subquery) ?>"/>
- <input class="form-submit" type="submit" value="<?php echo __('Search
%1%', array('%1%' => sfConfig::get('app_ui_label_actor'))) ?>"/>
- </form>
-</div>
--->
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
