X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FTicket%2FElements%2FShowDates;h=586c5ee0ba92255d87d2d48178acc1f9dabb2002;hb=b8988e1d3ac75af63c85e8563e57701030315a9e;hp=1a79628a9f8f59d6679fbecd1bb5717341f9fd78;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;p=freeside.git

diff --git a/rt/share/html/Ticket/Elements/ShowDates b/rt/share/html/Ticket/Elements/ShowDates
index 1a79628a9..586c5ee0b 100755
--- a/rt/share/html/Ticket/Elements/ShowDates
+++ b/rt/share/html/Ticket/Elements/ShowDates
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -46,42 +46,48 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 <table>
-  <tr>
-    <td class="label date created"><&|/l&>Created</&>:</td>
-    <td class="value date created"><% $Ticket->CreatedObj->AsString %></td>
+  <tr class="date created">
+    <td class="label"><&|/l&>Created</&>:</td>\
+    <td class="value"><% $Ticket->CreatedObj->AsString %></td>
   </tr>
-  <tr>
-    <td class="label date starts"><&|/l&>Starts</&>:</td>
-    <td class="value date starts"><% $Ticket->StartsObj->AsString %></td>
+  <tr class="date starts">
+    <td class="label"><&|/l&>Starts</&>:</td>\
+    <td class="value"><% $Ticket->StartsObj->AsString %></td>
   </tr>
-  <tr>
-    <td class="label date started"><&|/l&>Started</&>:</td>
-    <td class="value date started"><% $Ticket->StartedObj->AsString %></td>
+  <tr class="date started">
+    <td class="label"><&|/l&>Started</&>:</td>\
+    <td class="value"><% $Ticket->StartedObj->AsString %></td>
   </tr>
-  <tr>
-    <td class="label date told"><a href="<% RT->Config->Get('WebPath') %>/Ticket/Display.html?id=<% $Ticket->id %>&Action=SetTold"><&|/l&>Last Contact</&></a>:</td>
-    <td class="value date told"><% $Ticket->ToldObj->AsString %></td>
+  <tr class="date told">
+    <td class="label"><a href="<% RT->Config->Get('WebPath') %>/Ticket/Display.html?id=<% $Ticket->id %>&Action=SetTold"><&|/l&>Last Contact</&></a>:</td>\
+    <td class="value"><% $Ticket->ToldObj->AsString %></td>
   </tr>
-  <tr>
-    <td class="label date due"><&|/l&>Due</&>:</td>
+  <tr class="date due">
+    <td class="label"><&|/l&>Due</&>:</td>\
 % my $due = $Ticket->DueObj;
 % if ( $due && $due->Unix > 0 && $due->Diff < 0 ) {
-    <td class="value date due"><span class="overdue"><% $due->AsString  %></span></td>
+    <td class="value"><span class="overdue"><% $due->AsString  %></span></td>
 % } else {
-    <td class="value date due"><% $due->AsString  %></td>
+    <td class="value"><% $due->AsString  %></td>
 % }
   </tr>
-  <tr>
-    <td class="label date resolved"><&|/l&>Closed</&>:</td>
-    <td class="value date resolved"><% $Ticket->ResolvedObj->AsString  %></td>
+  <tr class="date resolved">
+    <td class="label"><&|/l&>Resolved</&>:</td>\
+    <td class="value"><% $Ticket->ResolvedObj->AsString  %></td>
   </tr>
+% my $willresolve = $Ticket->WillResolveObj;
+% if ( $willresolve && $willresolve->Unix > 0 ) {
   <tr>
-    <td class="label date updated"><&|/l&>Updated</&>:</td>
+    <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 class="date updated">
+    <td class="label"><&|/l&>Updated</&>:</td>\
 % my $UpdatedString = $Ticket->LastUpdated ? loc("[_1] by [_2]", $Ticket->LastUpdatedAsString, $m->scomp('/Elements/ShowUser', User => $Ticket->LastUpdatedByObj)) : loc("Never");
 % if ($UpdatedLink) {
-    <td class="value date updated"><a href="#lasttrans"><% $UpdatedString |n%></a></td>
+    <td class="value"><a href="#lasttrans"><% $UpdatedString | n %></a></td>
 % } else {
-    <td class="value date updated"><% $UpdatedString |n%></td>
+    <td class="value"><% $UpdatedString | n %></td>
 % }
   </tr>
 % $m->callback( %ARGS, CallbackName => 'EndOfList', TicketObj => $Ticket );