Author: david
Date: 2008-11-11 12:17:42 -0800 (Tue, 11 Nov 2008)
New Revision: 1564

Modified:
   trunk/qubit/lib/model/QubitActor.php
Log:
Sort QubitActor::getAllExceptUsers() by authorized form of name, with culture 
fallback. Fixes issue #491.

Modified: trunk/qubit/lib/model/QubitActor.php
===================================================================
--- trunk/qubit/lib/model/QubitActor.php        2008-11-11 20:02:43 UTC (rev 
1563)
+++ trunk/qubit/lib/model/QubitActor.php        2008-11-11 20:17:42 UTC (rev 
1564)
@@ -39,15 +39,22 @@
     return (string) $authorizedFormOfName;
   }
 
-  public static function getAllExceptUsers()
+  public static function getAllExceptUsers($options = array())
   {
     //returns all Actor objects except those that are
     //also an instance of the User class
     $criteria = new Criteria;
-    $criteria->addJoin(QubitActor::ID, QubitUser::ID, Criteria::LEFT_JOIN);
-    $criteria->add(QubitUser::ID);
+    $criteria->add(QubitObject::CLASS_NAME, 'QubitActor');
 
-    return self::get($criteria);
+    // sort by name
+    $criteria->addAscendingOrderByColumn('authorized_form_of_name');
+
+    // Do fallback
+    $context = sfContext::getInstance();
+    $culture = $context->getUser()->getCulture();
+    $criteria = $criteria = 
QubitCultureFallback::addFallbackCriteria($criteria, 'QubitActor', $culture, 
$options);
+
+    return QubitActor::get($criteria);
   }
 
   /**


--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---

Reply via email to