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

[falcone at bestpractical.com]

Author: falcone
Date: Tue Apr  7 17:30:12 2009
New Revision: 19093

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

Log:
 r46249 at ketch:  falcone | 2009-04-07 17:07:48 -0400
 * start displaying messages from library code after user modification


Modified: RT-Extension-MergeUsers/trunk/html/Callbacks/RT-Extension-MergeUsers/Admin/Users/Modify.html/RightColumnBottom
==============================================================================
--- RT-Extension-MergeUsers/trunk/html/Callbacks/RT-Extension-MergeUsers/Admin/Users/Modify.html/RightColumnBottom	(original)
+++ RT-Extension-MergeUsers/trunk/html/Callbacks/RT-Extension-MergeUsers/Admin/Users/Modify.html/RightColumnBottom	Tue Apr  7 17:30:12 2009
@@ -47,6 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 <br />
 <&| /Widgets/TitleBox, title => loc('Merge user') &>
+<p class="error"><% $result %></p>
 % my ($EffectiveId) = $UserObj->Attributes->Named("EffectiveId");
 % if ($EffectiveId) {
 This user has been merged with <a href="Modify.html?id=<% $EffectiveId->Content %>">
@@ -58,8 +59,9 @@
 % }
 </&>
 <%init>
+my ($id, $result);
 if ($MergeUser) {
-    $UserObj->MergeInto($MergeUser);
+    ($id, $result) = $UserObj->MergeInto($MergeUser);
 } elsif ($Unmerge) {
     $UserObj->UnMerge();
 }