Fixed bug#10961 - Adding email recipients via addressbook does not update customer information.

Marc Nilius · Marc Nilius · commit 2bac74b83c29 · 2015-04-20T10:25:05.000+02:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -21,6 +21,7 @@
  - 2015-01-06 Added ACLs handling for Owner and Responsible on screen load for AgentTicketOwner and AgentTicketResponsible.
 
 #4.0.8 2015-??-??
+ - 2015-04-20 Fixed bug#[10961](http://bugs.otrs.org/show_bug.cgi?id=10961) - Adding email recipients via addressbook does not update customer information.
  - 2015-04-17 Fixed bug#[11244](http://bugs.otrs.org/show_bug.cgi?id=11244) - Slave database not used in OTRS 4.
  - 2015-04-16 Fixed bug#[11123](http://bugs.otrs.org/show_bug.cgi?id=11123) - DynamicFieldText RegEx message problem on create and edit.
  - 2015-04-14 Fixed bug#[11226](http://bugs.otrs.org/show_bug.cgi?id=11226) - Tags in transition actions work only if there is only a tag in the field.
diff --git a/Kernel/Modules/AgentBook.pm b/Kernel/Modules/AgentBook.pm
@@ -31,7 +31,7 @@ sub Run {
     my $ParamObject = $Kernel::OM->Get('Kernel::System::Web::Request');
 
     # get params
-    for my $Recipient (qw(ToCustomer CcCustomer BccCustomer)) {
+    for my $Recipient (qw(ToCustomer CcCustomer BccCustomer CustomerData)) {
         $Param{$Recipient} = $ParamObject->GetParam( Param => $Recipient );
     }
 
@@ -53,7 +53,10 @@ sub Run {
             User => $CustomerUser,
         );
         if ( $CustomerUserData{UserEmail} ) {
-            $List{ $CustomerUserData{UserEmail} } = $CustomerUserList{$CustomerUser};
+            $List{ $CustomerUserData{UserEmail} } = {
+                Email       => $CustomerUserList{$CustomerUser},
+                CustomerKey => $CustomerUser,
+            };
         }
     }
 
@@ -71,13 +74,15 @@ sub Run {
         );
 
         my $Count = 1;
-        for ( reverse sort { $List{$b} cmp $List{$a} } keys %List ) {
+        for ( reverse sort { $List{$b}->{Email} cmp $List{$a}->{Email} } keys %List ) {
             $LayoutObject->Block(
                 Name => 'Row',
                 Data => {
-                    Name  => $List{$_},
-                    Email => $_,
+                    Email => $List{$_}->{Email},
                     Count => $Count,
+                    CustomerDataJSON =>
+                        $Kernel::OM->Get('Kernel::System::JSON')
+                        ->Encode( Data => { $List{$_}->{Email} => $List{$_}->{CustomerKey} } ),
                 },
             );
             $Count++;
diff --git a/Kernel/Output/HTML/Standard/AgentBook.tt b/Kernel/Output/HTML/Standard/AgentBook.tt
@@ -21,7 +21,7 @@
             <table id="SearchResult" class="DataTable SpacingTop">
                 <thead>
                     <tr>
-                        <th>[% Translate("Name") | html %]</th>
+                        <th>[% Translate("Email") | html %]</th>
                         <th>[% Translate("To") | html %]</th>
                         <th>[% Translate("Cc") | html %]</th>
                         <th>[% Translate("Bcc") | html %]</th>
@@ -30,8 +30,8 @@
                 <tbody>
 [% RenderBlockStart("Row") %]
                     <tr id="Row[% Data.Count | html %]">
-                        <td>[% Data.Name | html %]</td>
-                        <td><a href="" rel="ToCustomer" title="[% Translate("Add email address %s to the To field", Data.Email) | html %]">[% Translate("To") | html %]</a></td>
+                        <td>[% Data.Email | html %]</td>
+                        <td><a href="" data-customerdatajson="[% Data.CustomerDataJSON | html %]" rel="ToCustomer" title="[% Translate("Add email address %s to the To field", Data.Email) | html %]">[% Translate("To") | html %]</a></td>
                         <td><a href="" rel="CcCustomer" title="[% Translate("Add email address %s to the Cc field", Data.Email) | html %]">[% Translate("Cc") | html %]</a></td>
                         <td><a href="" rel="BccCustomer" title="[% Translate("Add email address %s to the Bcc field", Data.Email) | html %]">[% Translate("Bcc") | html %]</a></td>
                     </tr>
@@ -48,17 +48,18 @@
             <fieldset class="TableLike FixedLabel SpacingTop">
                 <label for="To">[% Translate("To") | html %]:</label>
                 <div class="Field">
-                    <input type="text" name="ToCustomer" id="ToCustomer" value="[% Data.ToCustomer | html %]" class="W75pc CustomerAutoComplete" />
+                    <input type="hidden" name="CustomerData" id="CustomerData" value="[% Data.CustomerData | html %]" />
+                    <input type="text" name="ToCustomer" id="ToCustomer" value="[% Data.ToCustomer | html %]" class="W75pc" />
                 </div>
                 <div class="Clear"></div>
                 <label for="Cc">[% Translate("Cc") | html %]:</label>
                 <div class="Field">
-                    <input type="text" name="CcCustomer" id="CcCustomer" value="[% Data.CcCustomer | html %]" class="W75pc CustomerAutoComplete" />
+                    <input type="text" name="CcCustomer" id="CcCustomer" value="[% Data.CcCustomer | html %]" class="W75pc" />
                 </div>
                 <div class="Clear"></div>
                 <label for="Bcc">[% Translate("Bcc") | html %]:</label>
                 <div class="Field">
-                    <input type="text" name="BccCustomer" id="BccCustomer" value="[% Data.BccCustomer | html %]" class="W75pc CustomerAutoComplete" />
+                    <input type="text" name="BccCustomer" id="BccCustomer" value="[% Data.BccCustomer | html %]" class="W75pc" />
                 </div>
             </fieldset>
         </form>
diff --git a/Kernel/Output/HTML/Standard/FooterJS.tt b/Kernel/Output/HTML/Standard/FooterJS.tt
@@ -40,6 +40,7 @@ Core.App.Ready(function () {
         AnimationEnabled: parseInt('[% Config("Frontend::AnimationEnabled") %]', 10),
         MenuDragDropEnabled: parseInt('[% Config("Frontend::MenuDragDropEnabled") %]', 10),
         OpenMainMenuOnHover: parseInt('[% Config("OpenMainMenuOnHover") %]', 10),
+        CustomerInfoSet: parseInt('[% Config("Ticket::Frontend::CustomerInfoCompose") %]', 10),
 [% RenderBlockStart("AutoCompleteConfig") %]
         Autocomplete: [% Data.AutocompleteConfig %],
 [% RenderBlockEnd("AutoCompleteConfig") %]
diff --git a/var/httpd/htdocs/js/Core.Agent.TicketAction.js b/var/httpd/htdocs/js/Core.Agent.TicketAction.js
@@ -103,12 +103,40 @@ Core.Agent.TicketAction = (function (TargetNS) {
      */
     function AddMailAddress($Link) {
         var $Element = $('#' + $Link.attr('rel')),
-            NewValue = $Element.val();
+            NewValue = $Element.val(),NewData,NewDataItem,Length;
+
         if (NewValue.length) {
             NewValue = NewValue + ', ';
         }
-        NewValue = NewValue + Core.Data.Get($Link.closest('tr'), 'Email');
-        $Element.val(NewValue);
+        NewValue = NewValue +
+            Core.Data.Get($Link.closest('tr'), 'Email')
+            .replace(/&quot;/g, '"')
+            .replace(/&lt;/g, '<')
+            .replace(/&gt;/g, '>');
+        $Element.val( NewValue );
+
+        Length= $Element.val().length;
+        $Element.focus();
+        $Element[0].setSelectionRange(Length, Length);
+
+        // set customer data for customer user information (AgentTicketEmail) in the compose screen
+        if ( $Link.attr('rel') === 'ToCustomer' && Core.Config.Get('CustomerInfoSet') ){
+
+            NewData = $('#CustomerData').val();
+            NewDataItem = Core.Data.Get($Link.closest('a'), 'customerdatajson');
+
+            if(NewData){
+                NewData = Core.JSON.Parse(NewData);
+                $.each(NewDataItem, function(CustomerMail, CustomerKey) {
+                    NewData[CustomerMail] = CustomerKey;
+                });
+                $('#CustomerData').val(Core.JSON.Stringify(NewData));
+            }
+            else
+            {
+                $('#CustomerData').val(Core.JSON.Stringify(NewDataItem));
+            }
+        }
     }
 
     /**
@@ -264,7 +292,7 @@ Core.Agent.TicketAction = (function (TargetNS) {
         // Register Apply button event
         $('#Apply').bind('click', function (Event) {
             // Update ticket action popup fields
-            var $To, $Cc, $Bcc;
+            var $To, $Cc, $Bcc, CustomerData;
 
             // Because we are in an iframe, we need to call the parent frames javascript function
             // with a jQuery object which is in the parent frames context
@@ -286,10 +314,22 @@ Core.Agent.TicketAction = (function (TargetNS) {
                 $Cc = $('#CcCustomer', parent.document);
                 $Bcc = $('#BccCustomer', parent.document);
 
-                $.each($('#ToCustomer').val().split(/, ?/), function(Index, Value){
-                    $To.val(Value);
-                    parent.Core.Agent.CustomerSearch.AddTicketCustomer( 'ToCustomer', Value );
-                });
+                // check is set customer data for customer user information
+                // it will not be set if it is used CustomerAutoComplete ( e.g for forwrad, reply ticket )
+                if ($('#CustomerData').val()) {
+                    CustomerData =Core.JSON.Parse($('#CustomerData').val());
+                    $.each(CustomerData, function(CustomerMail, CustomerKey) {
+                        $To.val(CustomerMail);
+                        parent.Core.Agent.CustomerSearch.AddTicketCustomer( 'ToCustomer',CustomerMail , CustomerKey );
+
+                    });
+                }
+                else{
+                    $.each($('#ToCustomer').val().split(/, ?/), function(Index, Value){
+                        $To.val(Value);
+                        parent.Core.Agent.CustomerSearch.AddTicketCustomer( 'ToCustomer', Value );
+                    });
+                }
 
                 $.each($('#CcCustomer').val().split(/, ?/), function(Index, Value){
                     $Cc.val(Value);
