Author: david
Date: Wed Oct 14 17:34:47 2009
New Revision: 3746
Log:
Copy changes from r3743 for repository auto-complete.
Added:
trunk/apps/qubit/modules/repository/templates/autocompleteSuccess.php
(contents, props changed)
- copied, changed from r3743,
trunk/apps/qubit/modules/actor/templates/autocompleteSuccess.php
Modified:
trunk/apps/qubit/modules/repository/actions/autocompleteAction.class.php
trunk/apps/qubit/modules/repository/config/view.yml
Modified:
trunk/apps/qubit/modules/repository/actions/autocompleteAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/repository/actions/autocompleteAction.class.php
Wed Oct 14 17:32:05 2009 (r3745)
+++ trunk/apps/qubit/modules/repository/actions/autocompleteAction.class.php
Wed Oct 14 17:34:47 2009 (r3746)
@@ -22,9 +22,14 @@
public function execute($request)
{
$criteria = new Criteria;
- $criteria->addJoin(QubitActorI18n::ID, QubitRepository::ID,
Criteria::INNER_JOIN);
- $criteria->add(QubitActorI18n::CULTURE, $this->getUser()->getCulture(),
Criteria::EQUAL);
+ $criteria->add(QubitObject::CLASS_NAME, 'QubitRepository');
+ $criteria->addJoin(QubitActorI18n::ID, QubitActor::ID);
$criteria->add(QubitActorI18n::AUTHORIZED_FORM_OF_NAME,
$request->query.'%', Criteria::LIKE);
+ $criteria->addAscendingOrderByColumn('authorized_form_of_name');
+ $criteria->setDistinct();
+ $criteria->setLimit(sfConfig::get('app_hits_per_page', 10));
+
+ $criteria = QubitCultureFallback::addFallbackCriteria($criteria,
'QubitActor');
// Filter 'denied' repositories if list for repository auto-complete on
info
// object form
@@ -51,13 +56,7 @@
$criteria->add(QubitRepository::ID, $deniedRepositories,
Criteria::NOT_IN);
}
- $this->pager = new QubitPager('QubitRepository');
- $this->pager->setCriteria($criteria);
- $this->pager->setPage($request->page);
- $this->pager->init();
-
- $this->repositories = $this->pager->getResults();
-
- $this->setTemplate('list');
+ $this->repositories = QubitRepository::get($criteria);
+ $this->setLayout('xmlResponseLayout');
}
}
Modified: trunk/apps/qubit/modules/repository/config/view.yml
==============================================================================
--- trunk/apps/qubit/modules/repository/config/view.yml Wed Oct 14 17:32:05
2009 (r3745)
+++ trunk/apps/qubit/modules/repository/config/view.yml Wed Oct 14 17:34:47
2009 (r3746)
@@ -13,6 +13,12 @@
components:
sidebar: []
+autocompleteSuccess:
+ javascripts: [-*]
+ stylesheets: [-*]
+ components:
+ sidebar: []
+
all:
components:
sidebar: [repository, contextMenu]
Copied and modified:
trunk/apps/qubit/modules/repository/templates/autocompleteSuccess.php (from
r3743, trunk/apps/qubit/modules/actor/templates/autocompleteSuccess.php)
==============================================================================
--- trunk/apps/qubit/modules/actor/templates/autocompleteSuccess.php Wed Oct
14 16:53:26 2009 (r3743, copy source)
+++ trunk/apps/qubit/modules/repository/templates/autocompleteSuccess.php
Wed Oct 14 17:34:47 2009 (r3746)
@@ -1,13 +1,13 @@
<table>
-<caption><?php echo __('actors') ?></caption>
+<caption><?php echo __('repository list') ?></caption>
<thead>
<tr><th><?php echo __('name') ?></th></tr>
</thead>
<tbody>
-<?php foreach($actors as $actor): ?>
+<?php foreach($repositories as $repository): ?>
<tr>
<td>
- <?php echo link_to($actor->getAuthorizedFormOfName(array('cultureFallback'
=> true)), array('module' => 'actor', 'action' => 'show', 'id' => $actor->id))
?>
+ <?php echo
link_to($repository->getAuthorizedFormOfName(array('cultureFallback' => true)),
array('module' => 'repository', 'action' => 'show', 'id' => $repository->id)) ?>
</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.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
