projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[freeside.git]
/
rt
/
html
/
Admin
/
Elements
/
SelectRights
diff --git
a/rt/html/Admin/Elements/SelectRights
b/rt/html/Admin/Elements/SelectRights
index
61a9e42
..
a0a5736
100644
(file)
--- a/
rt/html/Admin/Elements/SelectRights
+++ b/
rt/html/Admin/Elements/SelectRights
@@
-1,8
+1,8
@@
-%#
{{{ BEGIN BPS TAGGED BLOCK
+%#
BEGIN BPS TAGGED BLOCK {{{
%#
%# COPYRIGHT:
%#
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-200
4
Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-200
7
Best Practical Solutions, LLC
%# <jesse@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%# <jesse@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
@@
-22,7
+22,9
@@
%#
%# You should have received a copy of the GNU General Public License
%# along with this program; if not, write to the Free Software
%#
%# You should have received a copy of the GNU General Public License
%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+%# 02110-1301 or visit their web page on the internet at
+%# http://www.gnu.org/copyleft/gpl.html.
%#
%#
%# CONTRIBUTION SUBMISSION POLICY:
%#
%#
%# CONTRIBUTION SUBMISSION POLICY:
@@
-42,35
+44,38
@@
%# works based on those contributions, and sublicense and distribute
%# those contributions and any derivatives thereof.
%#
%# works based on those contributions, and sublicense and distribute
%# those contributions and any derivatives thereof.
%#
-%# }}} END BPS TAGGED BLOCK
-<INPUT TYPE=HIDDEN NAME="CheckACL" VALUE="<%$ACLDesc%>">
- <TABLE BORDER=0>
-<TR>
-<TD valign=top width="180" align="left">
+%# END BPS TAGGED BLOCK }}}
+<input type="hidden" class="hidden" name="CheckACL" value="<%$ACLDesc%>" />
+ <table border="0">
+<tr>
+<td valign="top" width="180" align="left">
+% my %current_rights;
<h3><&|/l&>Current rights</&></h3>
<h3><&|/l&>Current rights</&></h3>
-% if ($ACLObj->Count()
>
0) {
-<i>
(<&|/l&>Check box to revoke right</&>)</i> <BR>
+% if ($ACLObj->Count()
==
0) {
+<i>
<&|/l&>No rights granted.</&></i> <br />
% } else {
% } else {
-<i><&|/l&>No rights granted.</&></i> <BR>
-% }
+<i>(<&|/l&>Check box to revoke right</&>)</i> <br />
% while (my $right = $ACLObj->Next()) {
% if ($right->RightName) {
% while (my $right = $ACLObj->Next()) {
% if ($right->RightName) {
-<input type=checkbox value="<%$right->Id%>" name="RevokeRight-<%$ACLDesc%>-<%$right->RightName%>"> <% loc($right->RightName) %><br>
+% $current_rights{$right->RightName} = 1;
+<input type="checkbox" class="checkbox" value="<%$right->Id%>" name="RevokeRight-<%$ACLDesc%>-<%$right->RightName%>" /> <% loc($right->RightName) %><br />
% }
% }
% }
% }
-</TD>
-<TD valign=top>
+% }
+</td>
+<td valign="top">
<h3><&|/l&>New rights</&></h3>
<h3><&|/l&>New rights</&></h3>
-<
SELECT SIZE=5 MULTIPLE NAME
="GrantRight-<%$ACLDesc%>">
+<
select size="5" multiple name
="GrantRight-<%$ACLDesc%>">
% foreach $right (sort keys %Rights) {
% foreach $right (sort keys %Rights) {
- <OPTION VALUE="<%$right%>"
- ><% loc($right) %></OPTION>
+% next if $current_rights{$right};
+ <option value="<%$right%>"
+ ><% loc($right) %></option>
% }
% }
-<
OPTION VALUE="" SELECTED><&|/l&>(no value)</&></OPTION
>
-</
SELECT
>
-</
TD
>
-</
TR
>
-</
TABLE
>
+<
option value="" selected><&|/l&>(no value)</&></option
>
+</
select
>
+</
td
>
+</
tr
>
+</
table
>
<%INIT>
my ($right, $ACLDesc, $AppliesTo, %Rights);
<%INIT>
my ($right, $ACLDesc, $AppliesTo, %Rights);
@@
-100,7
+105,7
@@
}
else {
}
else {
- %Rights =
{ loc('System Error') => loc("No rights found")}
;
+ %Rights =
( loc('System Error') => loc("No rights found") )
;
}
$ACLDesc = "$PrincipalId-".ref($Object)."-".$Object->Id;
}
$ACLDesc = "$PrincipalId-".ref($Object)."-".$Object->Id;