[Bps-public-commit] RT-Extension-MergeUsers branch, master, updated. 0.08-8-gc1a2128

[Alex Vandiver]

The branch, master has been updated
       via  c1a2128a1e57a9b285af84174d4d69bc18e97d15 (commit)
      from  f0c4c2b387ccef645f65a5e0d6d79dcfc36c4b78 (commit)

Summary of changes:
 .../RT-Extension-MergeUsers/Admin/Users/Modify.html/RightColumnBottom   | 2 ++
 1 file changed, 2 insertions(+)

- Log -----------------------------------------------------------------
commit c1a2128a1e57a9b285af84174d4d69bc18e97d15
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Mar 25 15:31:58 2013 -0700

    Fix "Merge User" box during user creation
    
    c7467a9 missed the one case in which users do not have an attribute --
    namely, when the user object does not exist yet.  During user creation,
    do not present the "Merge User" box at all, as merging would not work.

diff --git a/html/Callbacks/RT-Extension-MergeUsers/Admin/Users/Modify.html/RightColumnBottom b/html/Callbacks/RT-Extension-MergeUsers/Admin/Users/Modify.html/RightColumnBottom
index cd6e69a..4cfb6f6 100644
--- a/html/Callbacks/RT-Extension-MergeUsers/Admin/Users/Modify.html/RightColumnBottom
+++ b/html/Callbacks/RT-Extension-MergeUsers/Admin/Users/Modify.html/RightColumnBottom
@@ -67,6 +67,8 @@ Merge this user into: <input name="MergeUser" value="" />
 % }
 </&>
 <%init>
+return unless $UserObj->id;
+
 my ($id, $result);
 if ($MergeUser) {
     ($id, $result) = $UserObj->MergeInto($MergeUser);

-----------------------------------------------------------------------