Merge branch '4.0/show-sla' into 4.0.0-releng

Author: sartak

html/RTIR/Create.html

@@ -128,6 +128,18 @@
             },
         },
         { special => 'roles' },
+
+        $QueueObj->SLADisabled ? () : (
+        {   name => 'SLA',
+            comp => '/Elements/SelectSLA',
+            args => {
+                Name => 'SLA',
+                Default => $ARGS{SLA} || RT::SLA->GetDefaultServiceLevel(Queue => $QueueObj),
+                DefaultValue => RT::SLA->GetDefaultServiceLevel(Queue => $QueueObj) ? 0 : 1,
+                QueueObj => $QueueObj,
+            },
+        }),
+
     ],
   &>
 

html/RTIR/Display.html

@@ -82,6 +82,12 @@
       <% $Ticket->Status %>
     </td>
   </tr>
+% if ( !$Ticket->QueueObj->SLADisabled ) {
+  <tr class="sla">
+    <td class="label"><&|/l&>SLA</&>:</td>
+    <td class="value"><% loc($Ticket->SLA) %></td>
+  </tr>
+% }
   <tr>
     <td class="label"><% loc("Incident") %>:</td>
     <td class="value">

html/RTIR/Edit.html

@@ -102,10 +102,15 @@
         Constituency => RT::IR->ConstituencyFor($Ticket)
     &></td>
   </tr>
-
-
-
-
+% if ( !$Ticket->QueueObj->SLADisabled ) {
+  <tr class="sla">
+    <td class="label"><&|/l&>SLA</&>:</td>
+    <td class="value"><& /Elements/SelectSLA,
+        Name => 'SLA',
+        Default => loc($Ticket->SLA)
+    &></td>
+  </tr>
+% }
 % if (!RT::IR->IsIncidentQueue($Ticket->QueueObj) ) {
   <tr class="incidents">
     <td class="label"><%loc("Incident")%>:</td>

html/RTIR/Incident/Create.html

@@ -139,6 +139,17 @@
         Default  => $ARGS{'Owner'} || $session{'CurrentUser'}->Id
     &></td>
 % }
+% if ( !$QueueObj->SLADisabled ) {
+  <tr class="sla">
+    <td class="label"><&|/l&>SLA</&>:</td>
+    <td class="value"><& /Elements/SelectSLA,
+        Name         => 'SLA',
+        Default      => $ARGS{SLA} || RT::SLA->GetDefaultServiceLevel(Queue => $QueueObj),
+        DefaultValue => RT::SLA->GetDefaultServiceLevel(Queue => $QueueObj) ? 0 : 1,
+        QueueObj     => $QueueObj,
+    &></td>
+  </tr>
+% }
 </tr>
 
 <& /RTIR/Elements/EditCustomFields, 

html/RTIR/Incident/Display.html

@@ -87,6 +87,12 @@
       <% $TicketObj->Status %>
     </td>
   </tr>
+% if ( !$TicketObj->QueueObj->SLADisabled ) {
+  <tr class="sla">
+    <td class="label"><&|/l&>SLA</&>:</td>
+    <td class="value"><% loc($TicketObj->SLA) %></td>
+  </tr>
+% }
   <tr>
     <td class="label"><&|/l&>Owner</&>:</td>
     <td class="value"><& /Elements/ShowUser, User => $TicketObj->OwnerObj &></td>