[Rt-commit] rt branch, 4.2/rest-search-refactor, updated. rt-4.0.1-239-g9f76037

[? sunnavy]

The branch, 4.2/rest-search-refactor has been updated
       via  9f76037b39e2731dc7d056ecb0c55ddc795fd789 (commit)
      from  a68af358fc1f8db93b6b414169647db24644fac9 (commit)

Summary of changes:
 share/html/REST/1.0/search/dhandler |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 9f76037b39e2731dc7d056ecb0c55ddc795fd789
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Sat Jun 25 15:28:54 2011 +0800

    search user defined groups only

diff --git a/share/html/REST/1.0/search/dhandler b/share/html/REST/1.0/search/dhandler
index e183d14..7cc4669 100755
--- a/share/html/REST/1.0/search/dhandler
+++ b/share/html/REST/1.0/search/dhandler
@@ -109,6 +109,11 @@ if ( $type =~ /^(ticket|queue|user|group)$/i ) {
     $n = 0;
     my @output;
 
+
+    if ( $type eq 'group' ) {
+        $objects->LimitToUserDefinedGroups;
+    }
+
     if ( defined $query && length $query ) {
         if ( $type eq 'ticket' ) {
             my ( $n, $s );
@@ -154,9 +159,6 @@ if ( $type =~ /^(ticket|queue|user|group)$/i ) {
         if ( $type eq 'queue' ) {
             $objects->UnLimit;
         }
-        elsif ( $type eq 'group' ) {
-            $objects->LimitToUserDefinedGroups;
-        }
         elsif ( $type eq 'user' ) {
             $objects->LimitToPrivileged;
         }

-----------------------------------------------------------------------