[Rt-commit] [svn] r1388 - in rt/branches/3.3-TESTING: . html/Admin/Elements

[jesse at pallas.eruditorum.org]

Author: jesse
Date: Wed Sep  1 00:43:19 2004
New Revision: 1388

Modified:
   rt/branches/3.3-TESTING/   (props changed)
   rt/branches/3.3-TESTING/html/Admin/Elements/SelectRights
Log:
 ----------------------------------------------------------------------
 r10114 at tinbook:  jesse | 2004-09-01T04:43:10.448516Z
 Don't show rights that a principal has in the list of rights that can be granted to them
 ----------------------------------------------------------------------


Modified: rt/branches/3.3-TESTING/html/Admin/Elements/SelectRights
==============================================================================
--- rt/branches/3.3-TESTING/html/Admin/Elements/SelectRights	(original)
+++ rt/branches/3.3-TESTING/html/Admin/Elements/SelectRights	Wed Sep  1 00:43:19 2004
@@ -47,22 +47,25 @@
      <TABLE BORDER=0>
 <TR>
 <TD valign=top width="180" align="left"> 
+%  my %current_rights;
 <h3><&|/l&>Current rights</&></h3>
-% if ($ACLObj->Count() > 0) {
-<i>(<&|/l&>Check box to revoke right</&>)</i> <BR>
-% } else {
+% if ($ACLObj->Count() == 0) {
 <i><&|/l&>No rights granted.</&></i> <BR>    
-% }
+% } else {
+<i>(<&|/l&>Check box to revoke right</&>)</i> <BR>
 % while (my $right = $ACLObj->Next()) {
 % if ($right->RightName) {
+% $current_rights{$right->RightName} = 1;
 <input type=checkbox value="<%$right->Id%>" name="RevokeRight-<%$ACLDesc%>-<%$right->RightName%>"> <% loc($right->RightName) %><br>
 % }
 %  }
+% }
 </TD>
 <TD valign=top>
 <h3><&|/l&>New rights</&></h3> 
 <SELECT SIZE=5  MULTIPLE  NAME="GrantRight-<%$ACLDesc%>">
 % foreach $right (sort keys %Rights) {
+% next if $current_rights{$right};
       <OPTION VALUE="<%$right%>"  
 	><% loc($right) %></OPTION>
 % }