Author: david
Date: Fri Sep 11 13:31:51 2009
New Revision: 3232
Log:
Sort archival description context menu alphabetically. Fixes issue #111.
Modified:
trunk/apps/qubit/modules/informationobject/actions/contextMenuComponent.class.php
trunk/lib/model/QubitInformationObject.php
Modified:
trunk/apps/qubit/modules/informationobject/actions/contextMenuComponent.class.php
==============================================================================
---
trunk/apps/qubit/modules/informationobject/actions/contextMenuComponent.class.php
Fri Sep 11 13:03:20 2009 (r3231)
+++
trunk/apps/qubit/modules/informationobject/actions/contextMenuComponent.class.php
Fri Sep 11 13:31:51 2009 (r3232)
@@ -155,7 +155,7 @@
{
$tmp = array();
- foreach ($ancestor->getChildren() as $child)
+ foreach ($ancestor->getChildren(array('sortBy' => 'title')) as $child)
{
// If ancestor is not the empty root node
// Or it children is in $path
@@ -173,7 +173,7 @@
// If it is the selected information object, add it children
else if ($child->getId() == $this->informationObject->getId())
{
- foreach ($child->getChildren() as $ch)
+ foreach ($child->getChildren(array('sortBy' => 'title')) as $ch)
{
$tmp[] = $ch;
}
Modified: trunk/lib/model/QubitInformationObject.php
==============================================================================
--- trunk/lib/model/QubitInformationObject.php Fri Sep 11 13:03:20 2009
(r3231)
+++ trunk/lib/model/QubitInformationObject.php Fri Sep 11 13:31:51 2009
(r3232)
@@ -438,6 +438,24 @@
$c = new Criteria;
$c->add(QubitInformationObject::PARENT_ID, $this->id, Criteria::EQUAL);
+ $sortBy = (isset($options['sortBy'])) ? $options['sortBy'] : 'lft';
+
+ switch ($sortBy)
+ {
+ case 'identifierTitle':
+ $c = QubitCultureFallback::addFallbackCriteria($c,
'QubitInformationObject');
+ $c->addAscendingOrderByColumn('identifier');
+ $c->addAscendingOrderByColumn('title');
+ break;
+ case 'title':
+ $c = QubitCultureFallback::addFallbackCriteria($c,
'QubitInformationObject');
+ $c->addAscendingOrderByColumn('title');
+ break;
+ case 'lft':
+ default:
+ $c->addAscendingOrderByColumn('lft');
+ }
+
return QubitInformationObject::get($c, $options);
}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
