[Rt-commit] rtir branch, master, updated. 4.0.1rc1-169-g20d30634

? sunnavy sunnavy at bestpractical.com
Wed Jun 3 14:42:11 EDT 2020


The branch, master has been updated
       via  20d30634957e8fc1f8c2e2692a514905d5c62fd7 (commit)
       via  a1feeadae089765950c554a2e5db855088286048 (commit)
       via  04db9c190b0db427968f01b4bd9f11813db219d1 (commit)
       via  6de856d6aec080f7cb38051fee4b4f5f801f47e2 (commit)
      from  9c78adab963ba38e6c40a5503c66bd4ef7bc6d29 (commit)

Summary of changes:
 etc/RTIR_Config.pm              | 2 +-
 html/RTIR/Advanced.html         | 4 ++--
 html/RTIR/Edit.html             | 6 +++++-
 html/RTIR/Elements/DueIncidents | 4 ++--
 html/RTIR/Incident/Create.html  | 2 ++
 html/RTIR/Incident/Display.html | 2 +-
 6 files changed, 13 insertions(+), 7 deletions(-)

- Log -----------------------------------------------------------------
commit 6de856d6aec080f7cb38051fee4b4f5f801f47e2
Author: Craig Kaiser <craig at bestpractical.com>
Date:   Thu Apr 16 08:44:26 2020 -0400

    Add priority class to incidents display priority div
    
    Without this class the "\" will not be hidden when there is no
    final priority value.

diff --git a/html/RTIR/Incident/Display.html b/html/RTIR/Incident/Display.html
index a7a1e6dd..ba7bde14 100644
--- a/html/RTIR/Incident/Display.html
+++ b/html/RTIR/Incident/Display.html
@@ -116,7 +116,7 @@
           <span class="current-value"><% $TicketObj->Subject %></span>
         </div>
       </div>
-      <div class="form-row">
+      <div class="priority form-row">
         <div class="label col-3">
           <&|/l&>Priority</&>:
         </div>

commit 04db9c190b0db427968f01b4bd9f11813db219d1
Author: Craig Kaiser <craig at bestpractical.com>
Date:   Thu Apr 16 08:57:25 2020 -0400

    Add Priority to RTIR portlets and orderby Priority 2nd

diff --git a/etc/RTIR_Config.pm b/etc/RTIR_Config.pm
index bb507a89..2a51e7ed 100644
--- a/etc/RTIR_Config.pm
+++ b/etc/RTIR_Config.pm
@@ -503,7 +503,7 @@ Set(%RTIRSearchResultFormats,
 
     DueIncidents =>
         q{'<b><a href="__RTIRTicketURI__">__id__</a></b>/TITLE:#',}.
-        q{'<b><a href="__RTIRTicketURI__">__Subject__</a></b>/TITLE:Subject',DueRelative,OwnerName,'UpdateStatus/TITLE:Updates'},
+        q{'<b><a href="__RTIRTicketURI__">__Subject__</a></b>/TITLE:Subject',DueRelative,OwnerName,__Priority__,'UpdateStatus/TITLE:Updates'},
 
     AbandonIncidents =>
         q{'<b><a href="__RTIRTicketURI__">__id__</a></b>/TITLE:#',}.
diff --git a/html/RTIR/Elements/DueIncidents b/html/RTIR/Elements/DueIncidents
index 90d52efa..43e1393a 100644
--- a/html/RTIR/Elements/DueIncidents
+++ b/html/RTIR/Elements/DueIncidents
@@ -93,6 +93,6 @@ $Query           => RT::IR->ActiveQuery( Lifecycle => 'incidents',  ($m->{'RTIR_
 $Format          => RT->Config->Get('RTIRSearchResultFormats')->{'DueIncidents'}
 $Rows            => undef
 $Page            => 1
-$OrderBy         => 'Due'
-$Order           => 'ASC'
+$OrderBy         => ['Due', 'Priority']
+$Order           => ['ASC', 'DESC']
 </%ARGS>

commit a1feeadae089765950c554a2e5db855088286048
Author: Craig Kaiser <craig at bestpractical.com>
Date:   Thu Apr 16 09:00:34 2020 -0400

    Pass queue object for priority as string to check

diff --git a/html/RTIR/Advanced.html b/html/RTIR/Advanced.html
index 8787899c..a991b017 100644
--- a/html/RTIR/Advanced.html
+++ b/html/RTIR/Advanced.html
@@ -108,7 +108,7 @@
     <&|/l&>Priority</&>:
   </div>
   <div class="value col-9">
-    <&/Elements/SelectPriority, Name=>"Priority", Default=>$Ticket->Priority &>
+    <&/Elements/SelectPriority, Name=>"Priority", Default=>$Ticket->Priority, QueueObj => $Ticket->QueueObj &>
   </div>
 </div>
 <div class="form-row">
@@ -116,7 +116,7 @@
     <&|/l&>Final Priority</&>:
   </div>
   <div class="value col-9">
-    <&/Elements/SelectPriority, Name=>"FinalPriority", Default=>$Ticket->FinalPriority &>
+    <&/Elements/SelectPriority, Name=>"FinalPriority", Default=>$Ticket->FinalPriority, QueueObj => $Ticket->QueueObj &>
   </div>
 </div>
 </&>
diff --git a/html/RTIR/Edit.html b/html/RTIR/Edit.html
index 988f6aaa..7443c368 100644
--- a/html/RTIR/Edit.html
+++ b/html/RTIR/Edit.html
@@ -154,7 +154,11 @@
         <&|/l&>Priority</&>:
       </div>
       <div class="value col-9">
-        <&/Elements/SelectPriority, Name => 'Priority', Default => $ARGS{'Priority'} || $Ticket->Priority &>
+        <&/Elements/SelectPriority,
+            Name     => 'Priority',
+            Default  => $ARGS{'Priority'} || $Ticket->Priority,
+            QueueObj => $Ticket->QueueObj,
+        &>
       </div>
     </div>
 % }
diff --git a/html/RTIR/Incident/Create.html b/html/RTIR/Incident/Create.html
index a9d2eb7a..ca8f8fe1 100644
--- a/html/RTIR/Incident/Create.html
+++ b/html/RTIR/Incident/Create.html
@@ -248,6 +248,7 @@ if ( $ChildObj && $ChildObj->id && !$ChildObj->CurrentUserHasRight('ModifyTicket
             comp => '/Elements/SelectPriority',
             args => {
                 Name    => 'InitialPriority',
+                QueueObj => $QueueObj,
                 Default =>
                     defined $ARGS{'InitialPriority'} && length $ARGS{'InitialPriority'}
                     ? $ARGS{'InitialPriority'}
@@ -260,6 +261,7 @@ if ( $ChildObj && $ChildObj->id && !$ChildObj->CurrentUserHasRight('ModifyTicket
             comp => '/Elements/SelectPriority',
             args => {
                 Name    => 'FinalPriority',
+                QueueObj => $QueueObj,
                 Default =>
                     defined $ARGS{'FinalPriority'} && length $ARGS{'FinalPriority'}
                     ? $ARGS{'FinalPriority'}

commit 20d30634957e8fc1f8c2e2692a514905d5c62fd7
Merge: 9c78adab a1feeada
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Jun 4 02:30:59 2020 +0800

    Merge branch '5.0/enable-priority-as-string'


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


More information about the rt-commit mailing list