Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / rt / share / html / Admin / Users / Memberships.html

diff --git a/rt/share/html/Admin/Users/Memberships.html b/rt/share/html/Admin/Users/Memberships.html
index cd8574d..1910ff5 100644 (file)
--- a/rt/share/html/Admin/Users/Memberships.html
+++ b/rt/share/html/Admin/Users/Memberships.html
@@ -1,40 +1,40 @@
 %# BEGIN BPS TAGGED BLOCK {{{
-%# 
+%#
 %# COPYRIGHT:
-%# 
-%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-%#                                          <jesse@bestpractical.com>
-%# 
+%#
+%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
+%#                                          <sales@bestpractical.com>
+%#
 %# (Except where explicitly superseded by other copyright notices)
-%# 
-%# 
+%#
+%#
 %# LICENSE:
-%# 
+%#
 %# This work is made available to you under the terms of Version 2 of
 %# the GNU General Public License. A copy of that license should have
 %# been provided with this software, but in any event can be snarfed
 %# from www.gnu.org.
-%# 
+%#
 %# This work is distributed in the hope that it will be useful, but
 %# WITHOUT ANY WARRANTY; without even the implied warranty of
 %# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %# General Public License for more details.
-%# 
+%#
 %# 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/licenses/old-licenses/gpl-2.0.html.
-%# 
-%# 
+%#
+%#
 %# CONTRIBUTION SUBMISSION POLICY:
-%# 
+%#
 %# (The following paragraph is not intended to limit the rights granted
 %# to you to modify and distribute this software under the terms of
 %# the GNU General Public License and is only of importance to you if
 %# you choose to contribute your changes and enhancements to the
 %# community by submitting them to Best Practical Solutions, LLC.)
-%# 
+%#
 %# By intentionally submitting any modifications, corrections or
 %# derivatives to this work, or any other work intended for use with
 %# Request Tracker, to Best Practical Solutions, LLC, you confirm that
@@ -43,99 +43,6 @@
 %# royalty-free, perpetual, license to use, copy, create derivative
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
-%# 
+%#
 %# END BPS TAGGED BLOCK }}}
-<& /Admin/Elements/Header, Title => $title  &>
-<& /Admin/Elements/UserTabs, 
-    id => $id, 
-    UserObj => $UserObj,
-    current_tab => $current_tab, 
-    Title => $title &>
-
-<& /Elements/ListActions, actions => \@results &>
-
-<form method="post" action="">
-<input type="hidden" id="<% $id %>" />
-
-<h2><&|/l&>Groups the user is member of (check box to delete)</&></h2>
-
-<& /Elements/CollectionList,
-    OrderBy => 'Name',
-    Order   => 'ASC',
-    Rows    => 0,
-    %ARGS,
-    DisplayFormat => "__CheckBox.{Delete}__,$Format",
-    Format => $Format,
-    Collection => $is_member,
-    AllowSorting => 1,
-    PassArguments => [qw(Format Rows Page Order OrderBy id)],
-&>
-
-<h2><&|/l&>Groups the user is not member of (check box to add)</&></h2>
-
-<& /Elements/CollectionList,
-    OrderBy => 'Name',
-    Order   => 'ASC',
-    Rows    => 100,
-    %ARGS,
-    DisplayFormat => "__CheckBox.{Add}__,'__HasMemberRecursively.{$id}__/TITLE:Recursive',$Format",
-    Format => $Format,
-    Collection => $is_not_member,
-    AllowSorting => 1,
-    PassArguments => [qw(Format Rows Page Order OrderBy id)],
-&>
-
-<& /Elements/Submit, Label => loc('Update'), Name => 'Update' &>
-
-</form>
-
-<%INIT>
-my $UserObj = RT::User->new($session{'CurrentUser'});
-$UserObj->Load( $id ) || Abort("Couldn't load user '$id'");
-
-my $title = loc("Memberships of the user [_1]", $UserObj->Name);
-my $current_tab = 'Admin/Users/Memberships.html?id='. $id;
-
-my @results;
-if ( $Update ) {
-    foreach my $gid( @Add ) {
-        my $group = RT::Group->new( $session{'CurrentUser'} );
-        $group->LoadUserDefinedGroup( $gid );
-        unless ( $group->id ) {
-            push @results, loc( "Couldn't load group #[_1]", $gid );
-            next;
-        }
-        my ($status, $msg) = $group->AddMember( $id );
-        push @results, $msg;
-    }
-    foreach my $gid( @Delete ) {
-        my $group = RT::Group->new( $session{'CurrentUser'} );
-        $group->LoadUserDefinedGroup( $gid );
-        unless ( $group->id ) {
-            push @results, loc( "Couldn't load group #[_1]", $gid );
-            next;
-        }
-        my ($status, $msg) = $group->DeleteMember( $id );
-        push @results, $msg;
-    }
-}
-
-my $is_member = RT::Groups->new( $session{'CurrentUser'} );
-$is_member->LimitToUserDefinedGroups;
-$is_member->WithMember( PrincipalId => $UserObj->Id );
-
-my $is_not_member = RT::Groups->new( $session{'CurrentUser'} );
-$is_not_member->LimitToUserDefinedGroups;
-$is_not_member->WithoutMember( PrincipalId => $UserObj->Id );
-
-$Format ||= RT->Config->Get('AdminSearchResultFormat')->{'Groups'};
-</%INIT>
-<%ARGS>
-$id     => undef
-
-$Update => 0,
-@Add    => (),
-@Delete => (),
-
-$Format => undef
-</%ARGS>
+<& /Admin/Elements/MembershipsPage, %ARGS &>