Putting 4.2.0 on top of 4.0.17

[usit-rt.git] / share / html / Ticket / Elements / EditBasics

diff --git a/share/html/Ticket/Elements/EditBasics b/share/html/Ticket/Elements/EditBasics
index 0d4159f811565b4521193e3a8f841ad72e22866c..1d111f081d07c66b9f4f4a89a29b5e7d5525a633 100644 (file)
--- a/share/html/Ticket/Elements/EditBasics
+++ b/share/html/Ticket/Elements/EditBasics
@@ -58,13 +58,12 @@ unless ( @fields ) {
             html => '<input name="Subject" value="'.$m->interp->apply_escapes( $defaults{'Subject'} || $TicketObj->Subject, 'h' ).'" />',
         },
         {   name => 'Status',
-            comp => '/Elements/SelectStatus',
+            comp => '/Ticket/Elements/SelectStatus',
             args => {
                 Name => 'Status',
-                DefaultLabel => loc("[_1] (Unchanged)",loc($TicketObj->Status)),
-                Default => $defaults{'Status'} || undef,
+                Default => $defaults{Status},
+                DefaultFromArgs => 0,
                 TicketObj => $TicketObj,
-                QueueObj => $TicketObj->QueueObj,
             },
         },
         {   name => 'Queue',
@@ -133,7 +132,7 @@ for my $field (@fields) {
 % }
 % for my $field (@fields) {
  <tr class="<% lc $field->{'name'} %>">\
-<td class="label"><&|/l&><% $field->{'name'} %></&>:</td>\
+<td class="label"><% loc($field->{'name'}) %>:</td>\
 <td class="value"><% $field->{'html'} |n %></td>\
 </tr>
 % }