diff options
| author | Mark Wells <mark@freeside.biz> | 2015-07-10 18:15:08 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2015-07-10 18:15:08 -0700 |
| commit | 88bf5db0cca989c51237c661a13078eef08b3674 (patch) | |
| tree | 0a84e1b5e7fd239f57fab678bf40c5311b0064a0 /rt/share/html/Ticket/Elements/EditBasics | |
| parent | 9c15ffe3a5ee987e30e10c6a0ad1b5bf0b2a12e3 (diff) | |
| parent | e7eb845db1afab1cbdbc34ff9c387c5ac554659e (diff) | |
Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.x
Diffstat (limited to 'rt/share/html/Ticket/Elements/EditBasics')
| -rwxr-xr-x | rt/share/html/Ticket/Elements/EditBasics | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/rt/share/html/Ticket/Elements/EditBasics b/rt/share/html/Ticket/Elements/EditBasics index 9f597838c..d6f18624a 100755 --- a/rt/share/html/Ticket/Elements/EditBasics +++ b/rt/share/html/Ticket/Elements/EditBasics @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -60,13 +60,12 @@ unless ( @fields ) { html => '<input name="Subject" value="'.(defined($subject) ? $m->interp->apply_escapes( $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, onchange => 'changeStatus()', }, }, @@ -148,7 +147,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> % } |