[Rt-commit] rtir branch 5.0/hide-unset-fields created. 5.0.1-21-g8742dd7c

BPS Git Server git at git.bestpractical.com
Wed Nov 3 18:29:23 UTC 2021


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "rtir".

The branch, 5.0/hide-unset-fields has been created
        at  8742dd7c9eb8653bfe3cd2f23aa5d75d06cfb0c2 (commit)

- Log -----------------------------------------------------------------
commit 8742dd7c9eb8653bfe3cd2f23aa5d75d06cfb0c2
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue Nov 2 05:15:31 2021 +0800

    Support to hide unset fields on display pages

diff --git a/html/RTIR/Display.html b/html/RTIR/Display.html
index ad4b7a26..7e64cbab 100644
--- a/html/RTIR/Display.html
+++ b/html/RTIR/Display.html
@@ -53,7 +53,7 @@
 <& /Elements/ListActions, actions => \@results &>
 <& /Ticket/Elements/ShowUpdateStatus, Ticket => $Ticket, DisplayPath => 'RTIR' &>
 
-<div class="summary"><&| /Widgets/TitleBox, title => loc('Ticket metadata') &>
+<div class="summary unset-fields-container <% $HideUnsetFields ? 'unset-fields-hidden' : '' %>"><&| /Widgets/TitleBox, title => loc('Ticket metadata'), titleright_raw => $m->scomp('/Elements/DropdownMenu', %ARGS, ShowSearchResults => 0) &>
 
 <div class="row ticket-summary">
   <div class="boxcontainer col-md-6">
@@ -100,7 +100,7 @@
       </div>
     </div>
 % if ( !$Ticket->QueueObj->SLADisabled ) {
-    <div class="form-row">
+    <div class="form-row <% $Ticket->SLA ? '' : 'unset-field' %>">
       <div class="label col-3">
         <&|/l&>SLA</&>:
       </div>
@@ -109,7 +109,7 @@
       </div>
     </div>
 % }
-    <div class="form-row">
+    <div class="form-row <% RT::IR->Incidents($Ticket)->Count ? '' : 'unset-field' %>">
       <div class="label col-3">
         <% loc("Incident") %>:
       </div>
@@ -117,7 +117,7 @@
         <& /RTIR/Elements/ShowIncidents, Ticket => $Ticket, InlineEdit => 0 &>
       </div>
     </div>
-    <div class="form-row">
+    <div class="form-row <% $Ticket->TimeWorked ? '' : 'unset-field' %>">
       <div class="label col-3">
         <&|/l&>Time Worked</&>:
       </div>
@@ -490,4 +490,5 @@ $Queue => undef
 @SelectedTickets => ()
 $ForceShowHistory => 0
 $InlineEdit       => RT->Config->Get( 'InlineEdit', $session{CurrentUser} )
+$HideUnsetFields  => RT->Config->Get('HideUnsetFieldsOnDisplay', $session{CurrentUser})
 </%ARGS>
diff --git a/html/RTIR/Elements/ShowDates b/html/RTIR/Elements/ShowDates
index e7bd764f..f43dd97f 100644
--- a/html/RTIR/Elements/ShowDates
+++ b/html/RTIR/Elements/ShowDates
@@ -53,7 +53,7 @@
       <span class="current-value"><% $Ticket->CreatedObj->AsString %></span>
     </div>
   </div>
-  <div class="form-row">
+  <div class="form-row <% $Ticket->StartsObj->Unix ? '' : 'unset-field' %>">
     <div class="label col-3">
       <&|/l&>Starts</&>:
     </div>
@@ -62,7 +62,7 @@
     </div>
   </div>
 % if ( RT::IR->IsReportQueue($Ticket->QueueObj) || RT::IR->IsInvestigationQueue($Ticket->QueueObj) || RT::IR->IsCountermeasureQueue($Ticket->QueueObj) ) {
-  <div class="form-row">
+  <div class="form-row <% $Ticket->StartedObj->Unix ? '' : 'unset-field' %>">
     <div class="label col-3">
       <&|/l&>Started</&>:
     </div>
@@ -71,7 +71,7 @@
     </div>
   </div>
 % }
-  <div class="form-row">
+  <div class="form-row <% $Ticket->DueObj->Unix ? '' : 'unset-field' %>">
     <div class="label col-3">
       <&|/l&>Due</&>:
     </div>
diff --git a/html/RTIR/Elements/ShowPeople b/html/RTIR/Elements/ShowPeople
index 8e71822d..7648e82a 100644
--- a/html/RTIR/Elements/ShowPeople
+++ b/html/RTIR/Elements/ShowPeople
@@ -70,7 +70,7 @@
 %# so fall back to nobody
 
 %     my $user = $users->First || RT->Nobody;
-  <div class="form-row">
+  <div class="form-row>
     <div class="label col-3">
       <% $role->Name %>:
     </div>
@@ -82,7 +82,7 @@
   </div>
 % }
 
-  <div class="form-row">
+  <div class="form-row <% $Ticket->Requestors->MembersObj->Count ? '' : 'unset-field' %>">
     <div class="label col-3">
       <&|/l&>Correspondents</&>:
     </div>
@@ -90,7 +90,7 @@
       <span class="current-value"><& /Ticket/Elements/ShowGroupMembers, Group => $Ticket->Requestors, Ticket => $Ticket &></span>
     </div>
   </div>
-  <div class="form-row">
+  <div class="form-row <% $Ticket->Cc->MembersObj->Count ? '' : 'unset-field' %>">
     <div class="label col-3">
       <&|/l&>Cc</&>:
     </div>
@@ -98,7 +98,7 @@
       <span class="current-value"><& /Ticket/Elements/ShowGroupMembers, Group => $Ticket->Cc, Ticket => $Ticket &></span>
     </div>
   </div>
-  <div class="form-row">
+  <div class="form-row <% $Ticket->AdminCc->MembersObj->Count ? '' : 'unset-field' %>">
     <div class="label col-3">
       <&|/l&>AdminCc</&>:
     </div>
@@ -110,7 +110,7 @@
 % my $multi_roles = $Ticket->QueueObj->CustomRoles;
 % $multi_roles->LimitToMultipleValue;
 % while (my $role = $multi_roles->Next) {
-  <div class="form-row">
+  <div class="form-row <% $Ticket->RoleGroup($role->GroupType)->MembersObj->Count ? '' : 'unset-field' %>">
     <div class="label col-3">
       <% $role->Name %>:
     </div>
diff --git a/html/RTIR/Incident/Display.html b/html/RTIR/Incident/Display.html
index 6e192d6c..199c2789 100644
--- a/html/RTIR/Incident/Display.html
+++ b/html/RTIR/Incident/Display.html
@@ -52,7 +52,7 @@
 <& /Elements/ListActions, actions => \@results &>
 <& /Ticket/Elements/ShowUpdateStatus, Ticket => $TicketObj, DisplayPath => 'RTIR'  &>
 
-<div class="summary"><&| /Widgets/TitleBox, title => loc('Ticket metadata') &>
+<div class="summary unset-fields-container <% $HideUnsetFields ? 'unset-fields-hidden' : '' %>"><&| /Widgets/TitleBox, title => loc('Ticket metadata'), titleright_raw => $m->scomp('/Elements/DropdownMenu', %ARGS, ShowSearchResults => 0) &>
 
 <div class="row ticket-summary">
   <div class="boxcontainer col-md-6">
@@ -99,7 +99,7 @@
         </div>
       </div>
 % if ( !$TicketObj->QueueObj->SLADisabled ) {
-      <div class="form-row">
+      <div class="form-row <% $TicketObj->SLA ? '' : 'unset-field' %>">
         <div class="label col-3">
           <&|/l&>SLA</&>:
         </div>
@@ -132,7 +132,7 @@
           <span class="current-value"><& /Ticket/Elements/ShowPriority, Ticket => $TicketObj &></span>
         </div>
       </div>
-      <div class="form-row">
+      <div class="form-row <% $TicketObj->TimeWorked ? '' : 'unset-field' %>">
         <div class="label col-3">
           <&|/l&>Time Worked</&>:
         </div>
@@ -528,4 +528,5 @@ $SelectedTicket => undef
 @SelectedTickets => ()
 $ForceShowHistory => 0
 $InlineEdit       => RT->Config->Get( 'InlineEdit', $session{CurrentUser} )
+$HideUnsetFields  => RT->Config->Get('HideUnsetFieldsOnDisplay', $session{CurrentUser})
 </%ARGS>

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


hooks/post-receive
-- 
rtir


More information about the rt-commit mailing list