[Rt-commit] [rtir] 03/07: DefaultDueIn/InitialPriority/FinalPriority have been moved to DefaultValue in RT 4.4

[? sunnavy]

This is an automated email from the git hooks/post-receive script.

sunnavy pushed a commit to branch 3.4/rt-4.4-compat
in repository rtir.

commit 6824a2b773e44c8dee4dda1f2671cf2eb2232ae9
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Oct 16 21:53:21 2015 +0800

    DefaultDueIn/InitialPriority/FinalPriority have been moved to DefaultValue in RT 4.4
---
 html/RTIR/Elements/ShowDates   | 6 +++++-
 html/RTIR/Incident/Create.html | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/html/RTIR/Elements/ShowDates b/html/RTIR/Elements/ShowDates
index be7ec53..3168d88 100644
--- a/html/RTIR/Elements/ShowDates
+++ b/html/RTIR/Elements/ShowDates
@@ -70,7 +70,11 @@
         <% $due->AsString %>
 % }
 % if ( !RT::IR->IsIncidentQueue($Ticket->QueueObj) && $Due ) {
+% if ( $Due =~ /^\d+$/ ) {
         [<a href="Display.html?Due_Date=now%20%2B%20<% $Due |u %>%20days&id=<% $Ticket->Id %>"><% loc("Set to [_1] days from now", $Due ) %></a>]
+% } else {
+        [<a href="Display.html?Due_Date=now%20%2B%20<% $Due |u %>&id=<% $Ticket->Id %>"><% loc("Set to [_1] from now", $Due ) %></a>]
+% }
 % }
     </td>
   </tr>
@@ -84,5 +88,5 @@
 $Ticket => undef
 </%ARGS>
 <%INIT>
-my $Due = ( $Ticket->QueueObj->DefaultDueIn || (RT->Config->Get('OverdueAfter')) || 7 ) ;
+my $Due = $Ticket->QueueObj->DefaultValue('Due') || RT->Config->Get('OverdueAfter') || 7;
 </%INIT>
diff --git a/html/RTIR/Incident/Create.html b/html/RTIR/Incident/Create.html
index ac0ae8f..db6fd8d 100644
--- a/html/RTIR/Incident/Create.html
+++ b/html/RTIR/Incident/Create.html
@@ -207,7 +207,7 @@ if ( $ChildObj && $ChildObj->id && !$ChildObj->CurrentUserHasRight('ModifyTicket
                 Default =>
                     defined $ARGS{'InitialPriority'} && length $ARGS{'InitialPriority'}
                     ? $ARGS{'InitialPriority'}
-                    : $QueueObj->InitialPriority
+                    : $QueueObj->DefaultValue('InitialPriority')
                 ,
             },
         },
@@ -219,7 +219,7 @@ if ( $ChildObj && $ChildObj->id && !$ChildObj->CurrentUserHasRight('ModifyTicket
                 Default =>
                     defined $ARGS{'FinalPriority'} && length $ARGS{'FinalPriority'}
                     ? $ARGS{'FinalPriority'}
-                    : $QueueObj->FinalPriority
+                    : $QueueObj->DefaultValue('FinalPriority')
                 ,
             },
         },

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.