Issue #1013: Make the buttons work. Fix scroll behaviour for added el…

…ements.
RotherOSS · Nov 1, 2021 · adec23d · adec23d
1 parent 9c44153
commit adec23d
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 14 deletions.
diff --git a/Kernel/Modules/CustomerTicketZoom.pm b/Kernel/Modules/CustomerTicketZoom.pm
@@ -1790,7 +1790,8 @@ sub _Mask {
                 $LayoutObject->Block(
                     Name => 'ProcessActivity',
                     Data => {
-                        ActivityHTML => $ActivityHTML,
+                        ActivityHTML           => $ActivityHTML,
+                        ActivityDialogEntityID => $NextActivityDialogs->{$NextActivityDialogKey},
                     },
                 );
             }

diff --git a/Kernel/Output/HTML/Templates/Standard/CustomerTicketZoom.tt b/Kernel/Output/HTML/Templates/Standard/CustomerTicketZoom.tt
@@ -44,7 +44,7 @@
 [% RenderBlockStart("NextActivities") %]
             <div id="NextActivities">
 [% RenderBlockStart("ActivityDialog") %]
-                <button id="Button_[% Data.ActivityDialogEntityID | uri %]" title="[% Data.Name | html %]" class="oooM">[% Data.Name | html %]</button>
+                <button id="Button_[% Data.ActivityDialogEntityID | uri %]" title="[% Data.Name | html %]" class="oooM ActivityStartButton">[% Data.Name | html %]</button>
 [% RenderBlockEnd("ActivityDialog") %]
             </div>
 [% RenderBlockEnd("NextActivities") %]
@@ -53,12 +53,12 @@
         </ul>
         <ul id='oooArticleListExpanded'>
 [% RenderBlockStart("ProcessActivity") %]
-            <li id="Process_[% Data.ActivityDialogEntityID | uri %]" class="">
+            <li id="Process_[% Data.ActivityDialogEntityID | uri %]" class="Activity">
                 [% Data.ActivityHTML %]
             </li>
 [% RenderBlockEnd("ProcessActivity") %]
 [% RenderBlockStart("FollowUp") %]
-<li id="FollowUp" class="[% Data.FollowUpVisible | html %]">
+<li id="FollowUp" class="[% Data.FollowUpVisible | html %] Activity">
     <form action="[% Env("CGIHandle") %]#FollowUp" method="post" enctype="multipart/form-data" name="compose" id="ReplyCustomerTicket" class="Validate PreventMultipleSubmits">
         <input type="hidden" name="Action" value="CustomerTicketZoom" />
         <input type="hidden" name="Subaction" value="Store" />

diff --git a/var/httpd/htdocs/js/Core.Customer.TicketZoom.js b/var/httpd/htdocs/js/Core.Customer.TicketZoom.js
@@ -190,7 +190,7 @@ Core.Customer.TicketZoom = (function (TargetNS) {
      * This function activates attachments, replybutton, info, and builds the article list.
      */
     function BuildArticles(){
-        $('#oooArticleListExpanded > li:not(#FollowUp)').each( function() {
+        $('#oooArticleListExpanded > li:not(.Activity)').each( function() {
             var Article = $(this);
             var Header  = Article.children('.MessageHeader').first();
 
@@ -252,7 +252,9 @@ Core.Customer.TicketZoom = (function (TargetNS) {
             ZoomExpand = $('#ZoomExpand').val(),
             $Form,
             FieldID,
-            DynamicFieldNames = Core.Config.Get('DynamicFieldNames');
+            DynamicFieldNames = Core.Config.Get('DynamicFieldNames'),
+            ActivityCount = $('#oooArticleListExpanded > .Activity').length;
+
 
         // otobo
         BuildArticles();
@@ -267,12 +269,27 @@ Core.Customer.TicketZoom = (function (TargetNS) {
                 $('#ReplyButton').hide();
             }
         });
-        $('#CloseButton').on('click', function(Event){
+
+        $('.ActivityStartButton').on('click', function(Event){
+            Event.preventDefault();
+            var DialogEntityID = $(this).attr('id').replace( /^Button_/, '' ),
+                $DialogWidget  = $( '#Process_' + DialogEntityID );
+
+            $DialogWidget.show();
+            $DialogWidget.addClass('Visible');
+            Core.UI.InputFields.Activate();
+            $('html').css({scrollTop: $('#Body').height()});
+        });
+
+        $('.CloseButton').on('click', function(Event){
             Event.preventDefault();
-            $FollowUp.hide();
-            $FollowUp.removeClass('Visible');
+            var ParentWidget = $(this).closest('li');
+            ParentWidget.hide();
+            ParentWidget.removeClass('Visible');
             $('html').css({scrollTop: $('#Body').height()});
-            $('#ReplyButton').show();
+            if ( ParentWidget.attr('id') === 'FollowUp' ) {
+                $('#ReplyButton').show();
+            }
         });
 
         // scroll events
@@ -292,7 +309,7 @@ Core.Customer.TicketZoom = (function (TargetNS) {
             }
 
             // track active article
-            var ActiveIndex = $('#oooArticleList > .oooActive').index() + 2,
+            var ActiveIndex = $('#oooArticleList > .oooActive').index() + 1 + ActivityCount,
                 StartIndex  = ActiveIndex,
                 ActiveChild = $('#oooArticleListExpanded > li:nth-child(' + ActiveIndex + ')');
 
@@ -318,8 +335,7 @@ Core.Customer.TicketZoom = (function (TargetNS) {
                         PrevChild = $('#oooArticleListExpanded > li:nth-child(' + ( ActiveIndex - 1 ) + ')');
                     }
                 }
-
-                $('#oooArticleList > li:nth-child(' + ( ActiveIndex - 1 ) +')').addClass('oooActive');
+                $('#oooArticleList > li:nth-child(' + ( ActiveIndex - ActivityCount ) +')').addClass('oooActive');
                 if ( ActiveIndex !== StartIndex ) {
                     $('#oooArticleList').scrollTop( $('#oooArticleList > .oooActive').position().top );
                 }

diff --git a/var/httpd/htdocs/skins/Customer/default/css/Core.TicketZoom.css b/var/httpd/htdocs/skins/Customer/default/css/Core.TicketZoom.css
@@ -191,7 +191,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
     background-color: var(--colBGLight);
 }
 
-#FollowUp {
+.Activity {
     display: none;
 }