3 commits - lib/api

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Wed Oct 3 02:06:41 CEST 2012


 lib/api/kolab_api_service_form_value.php |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 88d93b7ef66052cc5307a18a0c5871d99c15e6ae
Merge: deecf05 d7af013
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Oct 3 02:06:35 2012 +0200

    Merge branch 'master' of ssh://git.kolab.org/git/kolab-wap



commit deecf053b236bdcac4be34dc4948e349f70c2d39
Merge: 7fea658 d295dea
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Sep 28 13:58:25 2012 +0200

    Merge branch 'master' of ssh://git.kolab.org/git/kolab-wap



commit 7fea65863154c4f26bc8a5c9f49e42d17e3b77cf
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Sep 28 13:55:31 2012 +0200

    Sort and slice the array returned as part of form_value.list_options_member(), as it includes users and groups. (#1010)

diff --git a/lib/api/kolab_api_service_form_value.php b/lib/api/kolab_api_service_form_value.php
index 4b3430f..4e9a2b3 100644
--- a/lib/api/kolab_api_service_form_value.php
+++ b/lib/api/kolab_api_service_form_value.php
@@ -995,7 +995,6 @@ class kolab_api_service_form_value extends kolab_api_service
         $data['attributes'] = array('displayname', 'cn', 'mail');
 
         $service = $this->controller->get_service('users');
-
         $result  = $service->users_list(null, $data);
 
         $list    = $result['list'];
@@ -1021,6 +1020,13 @@ class kolab_api_service_form_value extends kolab_api_service
             }
         }
 
+        // Sort and slice
+        asort($list);
+
+        if (!empty($data['page_size'])) {
+            $list = array_slice($list, 0, $data['page_size']);
+        }
+
         return $list;
     }
 





More information about the commits mailing list