[freeside-commits] freeside/rt/share/html/Ticket/Elements EditDates, 1.1.1.3, 1.1.1.3.2.1 ShowDates, 1.1.1.3, 1.1.1.3.2.1
Mark Wells
mark at wavetail.420.am
Tue Aug 23 14:46:37 PDT 2011
Update of /home/cvs/cvsroot/freeside/rt/share/html/Ticket/Elements
In directory wavetail.420.am:/tmp/cvs-serv19603/rt/share/html/Ticket/Elements
Modified Files:
Tag: FREESIDE_2_3_BRANCH
EditDates ShowDates
Log Message:
RT future ticket resolve, #13853
Index: EditDates
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Ticket/Elements/EditDates,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.3.2.1
diff -u -w -d -r1.1.1.3 -r1.1.1.3.2.1
--- EditDates 17 Feb 2011 00:25:04 -0000 1.1.1.3
+++ EditDates 23 Aug 2011 21:46:34 -0000 1.1.1.3.2.1
@@ -70,6 +70,12 @@
<& /Elements/SelectDate, menu_prefix => 'Due', current => 0 &> (<% $TicketObj->DueObj->AsString %>)
</td>
</tr>
+ <tr>
+ <td class="label"><&|/l&>Close After</&>:</td>
+ <td class="entry">
+ <& /Elements/SelectDate, menu_prefix => 'WillResolve', current => 0 &> (<% $TicketObj->WillResolveObj->AsString %>)
+ </td>
+ </tr>
% $m->callback( %ARGS, CallbackName => 'EndOfList', Ticket => $TicketObj );
</table>
<%ARGS>
Index: ShowDates
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Ticket/Elements/ShowDates,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.3.2.1
diff -u -w -d -r1.1.1.3 -r1.1.1.3.2.1
--- ShowDates 17 Feb 2011 00:25:05 -0000 1.1.1.3
+++ ShowDates 23 Aug 2011 21:46:34 -0000 1.1.1.3.2.1
@@ -75,6 +75,13 @@
<td class="label date resolved"><&|/l&>Closed</&>:</td>
<td class="value date resolved"><% $Ticket->ResolvedObj->AsString %></td>
</tr>
+% my $willresolve = $Ticket->WillResolveObj;
+% if ( $willresolve && $willresolve->Unix > 0 ) {
+ <tr>
+ <td class="label date willresolve"><&|/l&>Will Resolve</&>:</td>
+ <td class="value date willresolve"><% $willresolve->AsString %></td>
+ </tr>
+% } # else don't display either of them
<tr>
<td class="label date updated"><&|/l&>Updated</&>:</td>
% my $UpdatedString = $Ticket->LastUpdated ? loc("[_1] by [_2]", $Ticket->LastUpdatedAsString, $m->scomp('/Elements/ShowUser', User => $Ticket->LastUpdatedByObj)) : loc("Never");
More information about the freeside-commits
mailing list