[Rt-commit] r15516 - in rt/branches/3.999-DANGEROUS: share/html/Admin/Elements share/html/Admin/Groups

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Wed Aug 27 08:03:58 2008
New Revision: 15516

Modified:
   rt/branches/3.999-DANGEROUS/   (props changed)
   rt/branches/3.999-DANGEROUS/share/html/Admin/Elements/SelectNewGroupMembers
   rt/branches/3.999-DANGEROUS/share/html/Admin/Groups/Members.html

Log:
 r16147 at sunnavys-mb:  sunnavy | 2008-08-27 18:52:59 +0800
 some name fixes in Admin/Groups


Modified: rt/branches/3.999-DANGEROUS/share/html/Admin/Elements/SelectNewGroupMembers
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Admin/Elements/SelectNewGroupMembers	(original)
+++ rt/branches/3.999-DANGEROUS/share/html/Admin/Elements/SelectNewGroupMembers	Wed Aug 27 08:03:58 2008
@@ -47,7 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 % if ( $show ne 'Groups' ) {
 <b><&|/l&>Users</&></b>
-<select multiple="multiple" name="<% $name %>Users" size="10">
+<select multiple="multiple" name="<% $name %>_users" size="10">
 % while ( my $user = $users->next ) {
 % next if $skip_users->{ $user->id };
 <option value="User-<% $user->id %>"><& /Elements/ShowUser, user => $user &></option>
@@ -67,7 +67,8 @@
 % }
 
 <%INIT>
-my $users = RT::Model::UserCollection->new();
+my $users = RT::Model::UserCollection->new( current_user =>
+        Jifty->web->current_user );
 
 $users->limit(
     column           => 'id',

Modified: rt/branches/3.999-DANGEROUS/share/html/Admin/Groups/Members.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Admin/Groups/Members.html	(original)
+++ rt/branches/3.999-DANGEROUS/share/html/Admin/Groups/Members.html	Wed Aug 27 08:03:58 2008
@@ -75,8 +75,8 @@
 <br />
 <br />
 <&|/l&>Users</&>
-% my $Users = $Group->user_members_obj( Recursively => 0 );
-% $Users->order_by( column => $Userorder_by, order => $userorder );
+% my $Users = $Group->user_members_obj( recursively => 0 );
+% $Users->order_by( column => $user_order_by, order => $userorder );
 <ul>
 % while ( my $user = $Users->next ) {
 % $UsersSeen{ $user->id } = 1 if $skip_seen_users;
@@ -131,10 +131,12 @@
     my $principal;
 
     if ($member =~ /^Group-(\d+)$/) {
-        $principal = RT::Model::Group->new();
+        $principal = RT::Model::Group->new( current_user =>
+                Jifty->web->current_user );
         $principal->load($1);
     } elsif ($member =~ /^User-(\d+)$/) {
-        $principal = RT::Model::User->new();
+        $principal = RT::Model::User->new( current_user =>
+                Jifty->web->current_user);
         $principal->load($1);
     } else {
         next;
@@ -151,7 +153,7 @@
 @add_members_users  => ()
 @add_members_groups => ()
 $id => undef
-$Userorder_by => 'name'
+$user_order_by => 'name'
 $userorder => 'ASC'
 $skip_seen_users => 1
 $skip_seen_groups => 1