From 9c68254528b6f2c7d8c1921b452fa56064783782 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 2 Mar 2008 04:06:06 +0000 Subject: import rt 3.4.6 --- rt/html/Admin/Groups/Members.html | 78 +++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 45 deletions(-) (limited to 'rt/html/Admin/Groups/Members.html') diff --git a/rt/html/Admin/Groups/Members.html b/rt/html/Admin/Groups/Members.html index 5d189a122..fd25b2d7f 100644 --- a/rt/html/Admin/Groups/Members.html +++ b/rt/html/Admin/Groups/Members.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -22,9 +22,7 @@ %# %# 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., 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. +%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. %# %# %# CONTRIBUTION SUBMISSION POLICY: @@ -52,37 +50,36 @@ <& /Elements/ListActions, actions => \@results &> -<&| /Widgets/TitleBox, title => loc('Editing membership for group [_1]', $Group->Name) &> +<& /Elements/TitleBoxStart, title => loc('Editing membership for group [_1]', $Group->Name) &> -
- - - - + + +
+ + + + + - + - + + - - + - - -

<&|/l&>Current members

-
+

<&|/l&>Add members

-
+
% if ($Group->MembersObj->Count == 0 ) { -<&|/l&>(No members) +<&|/l&>(No members) % } else { -<&|/l&>(Check box to delete) -
-
+<&|/l&>(Check box to delete) +
+
<&|/l&>Users -% my $Users = $Group->UserMembersObj; -% $Users->OrderBy( FIELD => $UserOrderBy, ORDER => $UserOrder ); -
    -% while (my $user = $Users->Next()) { -% $UsersSeen{$user->id} = 1 if $SkipSeenUsers; -
  • -<%$user->Name%> (<%$user->RealName%>) +% my $UserMembers = $Group->MembersObj; +% $UserMembers->LimitToUsers(); +
      +% while (my $member = $UserMembers->Next()) { +
    • +<%$member->MemberObj->Object->Name%> (<%$member->MemberObj->Object->RealName%>) % }
    <&|/l&>Groups @@ -90,20 +87,18 @@ % my $GroupMembers = $Group->MembersObj; % $GroupMembers->LimitToGroups(); % while (my $member = $GroupMembers->Next()) { -% $GroupsSeen{$member->MemberId} = 1 if $SkipSeenGroups; -
  • +
  • <%$member->MemberObj->Object->Name%> % } % } -
-
-<& /Admin/Elements/SelectNewGroupMembers, Name => "AddMembers", Group => $Group, - SkipUsers => \%UsersSeen, SkipGroups => \%GroupsSeen &> -
- + +
+<& /Admin/Elements/SelectNewGroupMembers, Name => "AddMembers", Group => $Group &> +
+<& /Elements/TitleBoxEnd &> <& /Elements/Submit, Label => loc('Modify Members'), Reset => 1 &>
@@ -151,9 +146,6 @@ foreach my $member (@AddMembers) { push (@results, $msg); } -my %UsersSeen; -my %GroupsSeen; -$GroupsSeen{$Group->id} = 1; # can't be a member of ourself @@ -161,8 +153,4 @@ $GroupsSeen{$Group->id} = 1; # can't be a member of ourself $AddMembersUsers => undef $AddMembersGroups => undef $id => undef -$UserOrderBy => 'Name' -$UserOrder => 'ASC' -$SkipSeenUsers => 1 -$SkipSeenGroups => 1 -- cgit v1.2.1