[Rt-commit] rtir branch, 5.0/enable-priority-as-string, created. 4.0.1rc1-143-g74dacd95

[Craig Kaiser]

The branch, 5.0/enable-priority-as-string has been created
        at  74dacd95d26c523b30834508dba2b83d2f4624bf (commit)

- Log -----------------------------------------------------------------
commit ade76943f28b6dcd6805576d05a28f14df035256
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 fd4d7c65..a305e3cf 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-md-3">
           <&|/l&>Priority</&>:
         </div>

commit 96372cfe977abc511c9373d9ed9c8c6fce33d2b8
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 1f02cdcf..3e08e3d2 100644
--- a/etc/RTIR_Config.pm
+++ b/etc/RTIR_Config.pm
@@ -508,7 +508,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 1a0e1c3a..0d8ec76f 100644
--- a/html/RTIR/Elements/DueIncidents
+++ b/html/RTIR/Elements/DueIncidents
@@ -91,6 +91,6 @@ $Query           => RT::IR->ActiveQuery( Lifecycle => 'incidents',  ($m->{'RTIR_
 $Format          => RT->Config->Get('RTIRSearchResultFormats')->{'DueIncidents'}
 $Rows            => undef
 $Page            => 1
-$OrderBy         => 'Due'
+$OrderBy         => ['Due', 'Priority']
 $Order           => 'ASC'
 </%ARGS>

commit 74dacd95d26c523b30834508dba2b83d2f4624bf
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 96a0d13a..e24c0e05 100644
--- a/html/RTIR/Advanced.html
+++ b/html/RTIR/Advanced.html
@@ -108,7 +108,7 @@
     <&|/l&>Priority</&>:
   </div>
   <div class="value col-md-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-md-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 1ab25ba8..0fbce1cc 100644
--- a/html/RTIR/Edit.html
+++ b/html/RTIR/Edit.html
@@ -154,7 +154,11 @@
         <&|/l&>Priority</&>:
       </div>
       <div class="value col-md-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 a4ecd5a6..179f9287 100644
--- a/html/RTIR/Incident/Create.html
+++ b/html/RTIR/Incident/Create.html
@@ -247,8 +247,8 @@ if ( $ChildObj && $ChildObj->id && !$ChildObj->CurrentUserHasRight('ModifyTicket
             name => 'Priority',
             comp => '/Elements/SelectPriority',
             args => {
-                Name    => 'InitialPriority',
-                Default =>
+                Name     => 'InitialPriority',
+                QueueObj => $QueueObj,
                     defined $ARGS{'InitialPriority'} && length $ARGS{'InitialPriority'}
                     ? $ARGS{'InitialPriority'}
                     : $QueueObj->DefaultValue('InitialPriority')
@@ -259,7 +259,8 @@ if ( $ChildObj && $ChildObj->id && !$ChildObj->CurrentUserHasRight('ModifyTicket
             name => 'Final Priority',
             comp => '/Elements/SelectPriority',
             args => {
-                Name    => 'FinalPriority',
+                Name     => 'FinalPriority',
+                QueueObj => $QueueObj,
                 Default =>
                     defined $ARGS{'FinalPriority'} && length $ARGS{'FinalPriority'}
                     ? $ARGS{'FinalPriority'}

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