[Rt-commit] rt branch, 5.0/selfservice-hide-timeworked, created. rt-5.0.0-10-g373fb13848

[Jim Brandt]

The branch, 5.0/selfservice-hide-timeworked has been created
        at  373fb138488d8e1bea37fdff3893d4331f550d86 (commit)

- Log -----------------------------------------------------------------
commit 373fb138488d8e1bea37fdff3893d4331f550d86
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Thu Sep 3 16:30:15 2020 -0400

    Restore Total Time Worked to previous position
    
    As part of the initial responsive work in a036b72184,
    the Total Time Worked entry was mistakenly moved up in the
    Basics section. This move placed it outside the
    $show_time_worked check, which resulted in it appearing in
    Self Service even with the HideTimeFieldsFromUnprivilegedUsers
    option enabled.

diff --git a/share/html/Ticket/Elements/ShowBasics b/share/html/Ticket/Elements/ShowBasics
index 93cedac458..a3c86afcb4 100644
--- a/share/html/Ticket/Elements/ShowBasics
+++ b/share/html/Ticket/Elements/ShowBasics
@@ -60,13 +60,6 @@
     <div class="value col-9"><span class="current-value"><% loc($Ticket->SLA) %></span></div>
   </div>
 % }
-% my $totalTimeWorked = 0;
-% if (RT->Config->Get('DisplayTotalTimeWorked') && ($totalTimeWorked = $Ticket->TotalTimeWorked)) {
-  <div class="total time worked sum form-row">
-    <div class="label col-3"><&|/l&>Total Time Worked</&>:</div>
-    <div class="value col-9"><span class="current-value"><& ShowTime, minutes => $totalTimeWorked &></span></div>
-  </div>
-% }
 % if ($show_time_worked) {
 % if ($Ticket->TimeEstimated) {
   <div class="time estimated form-row">
@@ -81,6 +74,13 @@
     <div class="value col-9"><span class="current-value"><& ShowTime, minutes => $Ticket->TimeWorked &></span></div>
   </div>
 % }
+% my $totalTimeWorked = 0;
+% if (RT->Config->Get('DisplayTotalTimeWorked') && ($totalTimeWorked = $Ticket->TotalTimeWorked)) {
+  <div class="total time worked sum form-row">
+    <div class="label col-3"><&|/l&>Total Time Worked</&>:</div>
+    <div class="value col-9"><span class="current-value"><& ShowTime, minutes => $totalTimeWorked &></span></div>
+  </div>
+% }
 % if ( keys %$time_worked ) {
 <div class="time worked by-user form-row">
   <div class="label col-3"><&|/l&>Users</&>:</div>

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