Author: jablko
Date: Wed Oct 27 17:57:34 2010
New Revision: 8584
Log:
s/$taxonomy/$resource
Modified:
trunk/apps/qubit/modules/taxonomy/actions/autocompleteAction.class.php
trunk/apps/qubit/modules/taxonomy/actions/browseAction.class.php
trunk/apps/qubit/modules/taxonomy/actions/indexAction.class.php
trunk/apps/qubit/modules/taxonomy/actions/listAction.class.php
trunk/apps/qubit/modules/taxonomy/templates/browseSuccess.php
trunk/apps/qubit/modules/taxonomy/templates/listSuccess.php
Modified: trunk/apps/qubit/modules/taxonomy/actions/autocompleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/taxonomy/actions/autocompleteAction.class.php
Wed Oct 27 17:51:45 2010 (r8583)
+++ trunk/apps/qubit/modules/taxonomy/actions/autocompleteAction.class.php
Wed Oct 27 17:57:34 2010 (r8584)
@@ -29,7 +29,7 @@
// Narrow results by query
if (0 < strlen($request->query))
{
- $criteria->add(QubitTaxonomyI18n::NAME, $request->query.'%',
Criteria::LIKE);
+ $criteria->add(QubitTaxonomyI18n::NAME, "$request->query%",
Criteria::LIKE);
}
// Limit results by ACL
Modified: trunk/apps/qubit/modules/taxonomy/actions/browseAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/taxonomy/actions/browseAction.class.php Wed Oct
27 17:51:45 2010 (r8583)
+++ trunk/apps/qubit/modules/taxonomy/actions/browseAction.class.php Wed Oct
27 17:57:34 2010 (r8584)
@@ -26,21 +26,23 @@
$request->limit = sfConfig::get('app_hits_per_page');
}
- $this->taxonomy = QubitTaxonomy::getById($request->id);
-
- if (!isset($this->taxonomy))
+ $this->resource = QubitTaxonomy::getById($request->id);
+ if (!isset($this->resource))
{
$this->forward404();
}
$criteria = new Criteria;
- $criteria->add(QubitTerm::TAXONOMY_ID, $this->taxonomy->id);
+ $criteria->add(QubitTerm::TAXONOMY_ID, $this->resource->id);
$criteria->addJoin(QubitTerm::ID, QubitObjectTermRelation::TERM_ID);
$criteria->addJoin(QubitObjectTermRelation::OBJECT_ID,
QubitInformationObject::ID);
$criteria = QubitAcl::addFilterDraftsCriteria($criteria);
+ // Do culture fallback
+ $criteria = QubitCultureFallback::addFallbackCriteria($criteria,
'QubitTerm');
+
$criteria->addGroupByColumn(QubitTerm::ID);
$criteria->addAsColumn('hits', 'COUNT('.QubitTerm::ID.')');
@@ -68,9 +70,6 @@
break;
}
- // Do culture fallback
- $criteria = QubitCultureFallback::addFallbackCriteria($criteria,
'QubitTerm');
-
$this->pager = new QubitPager('QubitTerm');
$this->pager->setCriteria($criteria);
$this->pager->setMaxPerPage($request->limit);
Modified: trunk/apps/qubit/modules/taxonomy/actions/indexAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/taxonomy/actions/indexAction.class.php Wed Oct
27 17:51:45 2010 (r8583)
+++ trunk/apps/qubit/modules/taxonomy/actions/indexAction.class.php Wed Oct
27 17:57:34 2010 (r8584)
@@ -28,20 +28,15 @@
$this->resource = $this->getRoute()->resource;
- if (!isset($this->resource))
- {
- $this->forward404();
- }
-
$criteria = new Criteria;
$criteria->add(QubitTerm::TAXONOMY_ID, $this->resource->id);
$criteria->add(QubitTerm::PARENT_ID, QubitTerm::ROOT_ID);
- $criteria->addAscendingOrderByColumn('name');
-
// Do source culture fallback
$criteria = QubitCultureFallback::addFallbackCriteria($criteria,
'QubitTerm');
+ $criteria->addAscendingOrderByColumn('name');
+
// Page results
$this->pager = new QubitPager('QubitTerm');
$this->pager->setCriteria($criteria);
Modified: trunk/apps/qubit/modules/taxonomy/actions/listAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/taxonomy/actions/listAction.class.php Wed Oct
27 17:51:45 2010 (r8583)
+++ trunk/apps/qubit/modules/taxonomy/actions/listAction.class.php Wed Oct
27 17:57:34 2010 (r8584)
@@ -31,11 +31,11 @@
// Show only editable taxonomies
$criteria = QubitTaxonomy::addEditableTaxonomyCriteria($criteria);
- $criteria->addAscendingOrderByColumn('name');
-
// Do source culture fallback
$criteria = QubitCultureFallback::addFallbackCriteria($criteria,
'QubitTaxonomy');
+ $criteria->addAscendingOrderByColumn('name');
+
// Page results
$this->pager = new QubitPager('QubitTaxonomy');
$this->pager->setCriteria($criteria);
Modified: trunk/apps/qubit/modules/taxonomy/templates/browseSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/taxonomy/templates/browseSuccess.php Wed Oct
27 17:51:45 2010 (r8583)
+++ trunk/apps/qubit/modules/taxonomy/templates/browseSuccess.php Wed Oct
27 17:57:34 2010 (r8584)
@@ -1,15 +1,15 @@
-<h1><?php echo __('Browse %1%', array('%1%' => render_title($taxonomy)))
?></h1>
+<h1><?php echo __('Browse %1%', array('%1%' => render_title($resource)))
?></h1>
<table class="sticky-enabled">
<thead>
<tr>
<th>
<?php if ('termNameUp' == $sf_request->sort): ?>
- <?php echo link_to(render_title($taxonomy), array('sort' =>
'termNameDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
+ <?php echo link_to(render_title($resource), array('sort' =>
'termNameDown') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
<?php echo image_tag('up.gif') ?>
<?php else: ?>
- <?php echo link_to(render_title($taxonomy), array('sort' =>
'termNameUp') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
+ <?php echo link_to(render_title($resource), array('sort' =>
'termNameUp') + $sf_request->getParameterHolder()->getAll(), array('title' =>
__('Sort'))) ?>
<?php if ('termNameDown' == $sf_request->sort): ?>
<?php echo image_tag('down.gif') ?>
@@ -52,8 +52,8 @@
<div class="content">
<ul class="clearfix links">
- <?php if (QubitAcl::check($taxonomy, array('edit', 'createTerm'))): ?>
- <li><?php echo link_to(__('Edit'), array($taxonomy, 'module' =>
'taxonomy')) ?></li>
+ <?php if (QubitAcl::check($resource, array('edit', 'createTerm'))): ?>
+ <li><?php echo link_to(__('Edit'), array($resource, 'module' =>
'taxonomy')) ?></li>
<?php endif; ?>
</ul>
</div>
Modified: trunk/apps/qubit/modules/taxonomy/templates/listSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/taxonomy/templates/listSuccess.php Wed Oct 27
17:51:45 2010 (r8583)
+++ trunk/apps/qubit/modules/taxonomy/templates/listSuccess.php Wed Oct 27
17:57:34 2010 (r8584)
@@ -10,12 +10,12 @@
</th>
</tr>
</thead><tbody>
- <?php foreach ($taxonomies as $taxonomy): ?>
+ <?php foreach ($taxonomies as $item): ?>
<tr class="<?php echo 0 == ++$row % 2 ? 'even' : 'odd' ?>">
<td>
- <?php echo link_to(render_title($taxonomy), array($taxonomy,
'module' => 'taxonomy')) ?>
+ <?php echo link_to(render_title($item), array($item, 'module' =>
'taxonomy')) ?>
</td><td>
- <?php echo $taxonomy->getNote(array('cultureFallback' => true)) ?>
+ <?php echo $item->getNote(array('cultureFallback' => true)) ?>
</td>
</tr>
<?php endforeach; ?>
--
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.
