Handle the filters on Identity/Gallery::list_users and Identity/Gallery::list_groups

3 files changed, 16 insertions, 4 deletions

diff --git a/modules/gallery/libraries/drivers/Identity.php b/modules/gallery/libraries/drivers/Identity.php
index 65a3891c..31bcfe39 100644
--- a/modules/gallery/libraries/drivers/Identity.php
+++ b/modules/gallery/libraries/drivers/Identity.php
@@ -106,6 +106,7 @@ interface Identity_Driver {
   /**
    * List the users
    * @param mixed      options to apply to the selection of the user
+   *                   @todo Do a longer write up on format of filters (@see Database.php)
    * @return array     the group list.
    */
   public function list_users($filter=array());
@@ -113,6 +114,7 @@ interface Identity_Driver {
   /**
    * List the groups
    * @param mixed      options to apply to the selection of the user
+   *                   @todo Do a longer write up on format of filters (@see Database.php)
    * @return array     the group list.
    */
   public function list_groups($filter=array());
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index c405c5e7..6c72440a 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -21,8 +21,8 @@ class Admin_Users_Controller extends Admin_Controller {
   public function index() {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_users.html");
-    $view->content->users = user::users(array("orderby" => array("name")));
-    $view->content->groups = group::groups(array("orderby" => array("name")));
+    $view->content->users = user::users(array("orderby" => array("name" => "ASC")));
+    $view->content->groups = group::groups(array("orderby" => array("name" => "ASC")));
     print $view;
   }
 
diff --git a/modules/user/libraries/drivers/Identity/Gallery.php b/modules/user/libraries/drivers/Identity/Gallery.php
index ab162a4c..774ef77c 100644
--- a/modules/user/libraries/drivers/Identity/Gallery.php
+++ b/modules/user/libraries/drivers/Identity/Gallery.php
@@ -211,7 +211,12 @@ class Identity_Gallery_Driver implements Identity_Driver {
    * @return array     the group list.
    */
   public function list_users($filter=array()) {
-    return ORM::factory("user")->orderby("name")->find_all();
+    $user = ORM::factory("user");
+    foreach($filter as $method => $args) {
+      $user->$method($args);
+    }
+
+    return $user->find_all();
   }
 
 
@@ -221,7 +226,12 @@ class Identity_Gallery_Driver implements Identity_Driver {
    * @return array     the group list.
    */
   public function list_groups($filter=array()) {
-    return ORM::factory("group")->orderby("name")->find_all();
+    $user = ORM::factory("group");
+    foreach($filter as $method => $args) {
+      $user->$method($args);
+    }
+
+    return $user->find_all();
   }
 
   /**