[Bps-public-commit] rt-extension-manageautocreatedusers branch, master, updated. 0.02-7-g7ed2eee

[Wallace Reis]

The branch, master has been updated
       via  7ed2eee48c0c41ed1ed2994ecc884de4890dc15a (commit)
       via  d55be9644b6b259f9acce40337ca232fb8dd09b2 (commit)
      from  29263af9c03a0b535de9b92d32c1f5ab743f6903 (commit)

Summary of changes:
 Changes                                    | 3 +++
 lib/RT/Extension/ManageAutoCreatedUsers.pm | 2 +-
 static/js/manage-autocreated-users.js      | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit d55be9644b6b259f9acce40337ca232fb8dd09b2
Author: Wallace Reis <wreis at bestpractical.com>
Date:   Thu Jun 5 12:32:36 2014 -0300

    Merge/Replace placeholder promotion
    
    If you enter an email address as the "Merge Into" field, *then* choose the
    Action, it clears the email address that you just entered. Prevent the change
    event for merge/replace in case we already have a value in the input.

diff --git a/static/js/manage-autocreated-users.js b/static/js/manage-autocreated-users.js
index 6b6d866..41fc864 100644
--- a/static/js/manage-autocreated-users.js
+++ b/static/js/manage-autocreated-users.js
@@ -6,7 +6,9 @@ jQuery(document).ready(function() {
         if ( selected_action.match('(replace|merge)') ) {
             var user_id = $this.attr('data-autocreated-userid');
             var $merge_field = jQuery('input[name="merge-user-' +  user_id + '"]');
-            $merge_field.val( $merge_field.attr('placeholder') );
+            if ( !$merge_field.val() ) {
+                $merge_field.val( $merge_field.attr('placeholder') );
+            }
         }
     });
 

commit 7ed2eee48c0c41ed1ed2994ecc884de4890dc15a
Author: Wallace Reis <wreis at bestpractical.com>
Date:   Thu Jun 5 12:34:55 2014 -0300

    Update changes & bump version

diff --git a/Changes b/Changes
index 32ebc42..c62d4dd 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
 Revision history for RT-Extension-ManageAutoCreatedUsers
 
+0.06     2014-06-05
+ - Fix Merge/Replace placeholder promotion
+
 0.05     2014-05-24
  - No code changes. Fixed dist release.
 
diff --git a/lib/RT/Extension/ManageAutoCreatedUsers.pm b/lib/RT/Extension/ManageAutoCreatedUsers.pm
index 1ee90a3..5de11fb 100644
--- a/lib/RT/Extension/ManageAutoCreatedUsers.pm
+++ b/lib/RT/Extension/ManageAutoCreatedUsers.pm
@@ -6,7 +6,7 @@ use RT::Extension::MergeUsers;
 use Scalar::Util 'blessed';
 use Module::Runtime 'use_module';
 
-our $VERSION = '0.05';
+our $VERSION = '0.06';
 
 RT->AddJavaScript('manage-autocreated-users.js');
 

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