Author: david
Date: Mon Oct 5 13:59:31 2009
New Revision: 3665
Log:
Apply culture fallback to term autocomplete.
Modified:
trunk/apps/qubit/modules/term/actions/autocompleteAction.class.php
Modified: trunk/apps/qubit/modules/term/actions/autocompleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/term/actions/autocompleteAction.class.php Mon Oct
5 13:00:11 2009 (r3664)
+++ trunk/apps/qubit/modules/term/actions/autocompleteAction.class.php Mon Oct
5 13:59:31 2009 (r3665)
@@ -33,14 +33,12 @@
$criteria = new Criteria;
$criteria->add(QubitTermI18n::NAME, $request->query.'%', Criteria::LIKE);
$criteria->add(QubitTerm::TAXONOMY_ID, $request->taxonomyId,
Criteria::EQUAL);
- $criteria->add(QubitTermI18n::CULTURE, $this->getUser()->getCulture());
- $criteria->addAscendingOrderByColumn(QubitTermI18n::NAME);
+ $criteria->addAscendingOrderByColumn('name');
$criteria->addJoin(QubitTerm::ID, QubitTermI18n::ID);
+ $criteria->setDistinct();
+ $criteria->setLimit(10);
- $this->pager = new QubitPager('QubitTerm');
- $this->pager->setCriteria($criteria);
- $this->pager->setPage($request->page);
- $this->pager->init();
+ $criteria = QubitCultureFallback::addFallbackCriteria($criteria,
'QubitTerm');
$tableHtml = <<<EOL
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
@@ -57,7 +55,7 @@
EOL;
- foreach ($this->pager->getResults() as $term)
+ foreach (QubitTerm::get($criteria) as $term)
{
// Search for preferred term
$c = new Criteria;
@@ -68,12 +66,12 @@
if (null !== ($prefTerm = QubitTerm::getOne($c)))
{
$termId = $prefTerm->id;
- $label = $this->getContext()->getI18N()->__('%1% (use: %2%)',
array('%1%' => $term->name, '%2%' => $prefTerm->name));
+ $label = $this->getContext()->getI18N()->__('%1% (use: %2%)',
array('%1%' => $term->getName(array('cultureFallback' => true)), '%2%' =>
$prefTerm->getName(array('cultureFallback' => true))));
}
else
{
$termId = $term->id;
- $label = $term->name;
+ $label = $term->getName(array('cultureFallback' => true));
}
$tableHtml .= '<tr><td>'.link_to($label, array('module' => 'term',
'action' => 'show', 'id' => $termId)).'</td></tr>';
--~--~---------~--~----~------------~-------~--~----~
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.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
