[Bps-public-commit] r17012 - in RT-Extension-MergeUsers/trunk: . html/Admin html/Callbacks html/Callbacks/RT-Extension-MergeUsers html/Callbacks/RT-Extension-MergeUsers/Admin html/Callbacks/RT-Extension-MergeUsers/Admin/Users

[falcone at bestpractical.com]

Author: falcone
Date: Sun Nov 23 18:48:09 2008
New Revision: 17012

Added:
   RT-Extension-MergeUsers/trunk/html/Callbacks/
   RT-Extension-MergeUsers/trunk/html/Callbacks/RT-Extension-MergeUsers/
   RT-Extension-MergeUsers/trunk/html/Callbacks/RT-Extension-MergeUsers/Admin/
   RT-Extension-MergeUsers/trunk/html/Callbacks/RT-Extension-MergeUsers/Admin/Users/
   RT-Extension-MergeUsers/trunk/html/Callbacks/RT-Extension-MergeUsers/Admin/Users/Modify.html/
   RT-Extension-MergeUsers/trunk/html/Callbacks/RT-Extension-MergeUsers/Admin/Users/Modify.html/RightColumnBottom
Removed:
   RT-Extension-MergeUsers/trunk/html/Admin/
Modified:
   RT-Extension-MergeUsers/trunk/   (props changed)

Log:
 r41882 at ketch:  falcone | 2008-11-23 18:38:06 -0500
 * remove the really old copy of Admin/Users/Modify.html and
   use callbacks to add the Merge box instead


Added: RT-Extension-MergeUsers/trunk/html/Callbacks/RT-Extension-MergeUsers/Admin/Users/Modify.html/RightColumnBottom
==============================================================================
--- (empty file)
+++ RT-Extension-MergeUsers/trunk/html/Callbacks/RT-Extension-MergeUsers/Admin/Users/Modify.html/RightColumnBottom	Sun Nov 23 18:48:09 2008
@@ -0,0 +1,71 @@
+%# BEGIN BPS TAGGED BLOCK {{{
+%# 
+%# COPYRIGHT:
+%# 
+%# This software is Copyright (c) 1996-2008 Best Practical Solutions, LLC
+%#                                          <sales at 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
+%# you are the copyright holder for those contributions and you grant
+%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+%# 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 }}}
+<br />
+<&| /Widgets/TitleBox, title => loc('Merge user') &>
+% my ($EffectiveId) = $UserObj->Attributes->Named("EffectiveId");
+% if ($EffectiveId) {
+This user has been merged with <a href="Modify.html?id=<% $EffectiveId->Content %>">
+% my $real = RT::User->new($session{'CurrentUser'});
+% $real->Load($EffectiveId->Content);
+<% $real->EmailAddress %></a>; <input type="submit" name="Unmerge" value="Unmerge" />
+% } else {
+Merge this user into: <input name="MergeUser" value="" />
+% }
+</&>
+<%init>
+if ($MergeUser) {
+    $UserObj->MergeInto($MergeUser);
+} elsif ($Unmerge) {
+    $UserObj->UnMerge();
+}
+</%init>
+<%args>
+$UserObj => undef
+$MergeUser => undef
+$Unmerge => undef
+</%args>