[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-801-gac967fc

[Jesse Vincent]

The branch, 3.9-trunk has been updated
       via  ac967fc75063f0cc168371b1d95d245e3f0ee0d6 (commit)
      from  6b958e23910a4cc634b499f9d4f420d48885dcd5 (commit)

Summary of changes:
 share/html/Admin/Queues/People.html |   46 ++++++++++++++++++----------------
 1 files changed, 24 insertions(+), 22 deletions(-)

- Log -----------------------------------------------------------------
commit ac967fc75063f0cc168371b1d95d245e3f0ee0d6
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Fri Sep 17 22:07:45 2010 -0400

    clean up Admin/Queues/People.html to un-negate some logic and silence
    warnings

diff --git a/share/html/Admin/Queues/People.html b/share/html/Admin/Queues/People.html
index 63d5de5..0b71a37 100755
--- a/share/html/Admin/Queues/People.html
+++ b/share/html/Admin/Queues/People.html
@@ -176,28 +176,30 @@ unless ($OnlySearchForPeople or $OnlySearchForGroup) {
 }
  
 
-if (!length $ARGS{'UserString'}) {
-$user_msg = loc("No principals selected.");
- }
-else {
-    $Users = RT::Users->new($session{'CurrentUser'});
-    $Users->Limit(FIELD => $ARGS{'UserField'},
-                 VALUE => $ARGS{'UserString'},
-                 OPERATOR => $ARGS{'UserOp'});
-     }
-
-if (!length $ARGS{'GroupString'}) {
-$group_msg = loc("No principals selected.");
- }
-else {
-$Groups = RT::Groups->new($session{'CurrentUser'});
-$Groups->Limit(FIELD => 'Domain', OPERATOR => '=', VALUE => 'UserDefined');
-$Groups->Limit(FIELD => $ARGS{'GroupField'},
-		VALUE => $ARGS{'GroupString'},
-		OPERATOR => $ARGS{'GroupOp'});
-     }
-
-$current_tab = 'Admin/Queues/People.html?id='.$QueueObj->id;
+if ( $ARGS{'UserString'} ) {
+    $Users = RT::Users->new( $session{'CurrentUser'} );
+    $Users->Limit( FIELD    => $ARGS{'UserField'},
+                   VALUE    => $ARGS{'UserString'},
+                   OPERATOR => $ARGS{'UserOp'}
+                 );
+} else {
+    $user_msg = loc("No principals selected.");
+    }
+
+if ( $ARGS{'GroupString'} ) {
+    $Groups = RT::Groups->new( $session{'CurrentUser'} );
+    $Groups->Limit( FIELD    => 'Domain',
+                    OPERATOR => '=',
+                    VALUE    => 'UserDefined'
+                  );
+    $Groups->Limit( FIELD    => $ARGS{'GroupField'},
+                    VALUE    => $ARGS{'GroupString'},
+                    OPERATOR => $ARGS{'GroupOp'}
+                  );
+} else {
+    $group_msg = loc("No principals selected.");
+}
+$current_tab = 'Admin/Queues/People.html?id=' . $QueueObj->id;
 </%INIT>
 
 <%ARGS>

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