[Rt-commit] r18570 - in rt/3.999/trunk: . lib/RT share/html/Elements share/html/Elements/RT__Model__Ticket share/html/Ticket/Elements

[sartak at bestpractical.com]

Author: sartak
Date: Tue Feb 24 21:03:31 2009
New Revision: 18570

Modified:
   rt/3.999/trunk/   (props changed)
   rt/3.999/trunk/lib/RT/Record.pm
   rt/3.999/trunk/share/html/Elements/ColumnMap
   rt/3.999/trunk/share/html/Elements/MyReminders
   rt/3.999/trunk/share/html/Elements/RT__Model__Ticket/ColumnMap
   rt/3.999/trunk/share/html/Ticket/Elements/Reminders
   rt/3.999/trunk/t/api/date.t

Log:
 r80533 at onn:  sartak | 2009-02-24 21:03:26 -0500
 Remove age_as_string in favor of age, and long_since_update_as_string which wasn't used anywhere


Modified: rt/3.999/trunk/lib/RT/Record.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Record.pm	(original)
+++ rt/3.999/trunk/lib/RT/Record.pm	Tue Feb 24 21:03:31 2009
@@ -345,34 +345,6 @@
 }
 
 
-
-# There is room for optimizations in most of those subs:
-
-#
-# TODO: This should be deprecated
-#
-sub age_as_string {
-    my $self = shift;
-    return ( $self->created->age_as_string() );
-}
-
-
-#
-# TODO This should be deprecated
-#
-sub long_since_update_as_string {
-    my $self = shift;
-    if ( $self->last_updated ) {
-
-        return ( $self->last_updated->age_as_string() );
-
-    } else {
-        return "never";
-    }
-}
-
-
-
 #
 sub _set {
     my $self = shift;

Modified: rt/3.999/trunk/share/html/Elements/ColumnMap
==============================================================================
--- rt/3.999/trunk/share/html/Elements/ColumnMap	(original)
+++ rt/3.999/trunk/share/html/Elements/ColumnMap	Tue Feb 24 21:03:31 2009
@@ -70,7 +70,7 @@
     created_relative => {
         attribute => 'Created',
         title     => 'Created', # loc
-        value     => sub  { return $_[0]->created->age_as_string }
+        value     => sub  { return $_[0]->created->age }
     },
     created_by => {
         attribute => 'CreatedBy',
@@ -85,7 +85,7 @@
     last_updated_relative => {
         attribute => 'last_updated',
         title     => 'Last Updated', # loc
-        value     => sub  { return $_[0]->last_updated->age_as_string }
+        value     => sub  { return $_[0]->last_updated->age }
     },
     last_updated_by => {
         attribute => 'last_updated_by',

Modified: rt/3.999/trunk/share/html/Elements/MyReminders
==============================================================================
--- rt/3.999/trunk/share/html/Elements/MyReminders	(original)
+++ rt/3.999/trunk/share/html/Elements/MyReminders	Tue Feb 24 21:03:31 2009
@@ -57,7 +57,7 @@
 <tr class="<%$i%2 ? 'evenline' : 'oddline'%>"><td><a href="<%RT->config->get('WebPath')%>/Ticket/Display.html?id=<%$ticket->id%>"><%$reminder->subject%></a><br />
 <blockquote>
 #<%$ticket->id%>: <%$ticket->subject%><br />
-<%$reminder->owner_obj->name %>  <%$reminder->due_obj->unix >0 ? '&bull; '.$reminder->due_obj->age_as_string : '' |n %>
+<%$reminder->owner_obj->name %>  <%$reminder->due_obj->unix >0 ? '&bull; '.$reminder->due_obj->age : '' |n %>
 </blockquote>
 </td>
 </tr>

Modified: rt/3.999/trunk/share/html/Elements/RT__Model__Ticket/ColumnMap
==============================================================================
--- rt/3.999/trunk/share/html/Elements/RT__Model__Ticket/ColumnMap	(original)
+++ rt/3.999/trunk/share/html/Elements/RT__Model__Ticket/ColumnMap	Tue Feb 24 21:03:31 2009
@@ -181,17 +181,17 @@
     starts_relative => {
         title     => 'Starts', # loc
         attribute => 'starts',
-        value     => sub  { return $_[0]->starts_obj->age_as_string }
+        value     => sub  { return $_[0]->starts_obj->age }
     },
     started_relative => {
         title     => 'Started', # loc
         attribute => 'Started',
-        value     => sub  { return $_[0]->started_obj->age_as_string }
+        value     => sub  { return $_[0]->started_obj->age }
     },
     told_relative => {
         title     => 'Told', # loc
         attribute => 'Told',
-        value     => sub  { return $_[0]->told_obj->age_as_string }
+        value     => sub  { return $_[0]->told_obj->age }
     },
     due_relative => {
         title     => 'Due', # loc
@@ -200,16 +200,16 @@
             my $date = $_[0]->due_obj;
             # Highlight the date if it was due in the past, and it's still active
             if ( $date && $date->unix > 0 && $date->diff < 0 && $_[0]->queue->status_schema->is_active($_[0]->status)) {
-                return (\'<span class="overdue">' , $date->age_as_string , \'</span>');
+                return (\'<span class="overdue">' , $date->age , \'</span>');
             } else {
-                return $date->age_as_string;
+                return $date->age;
             }
         }
     },
     resolved_relative => {
         title     => 'Resolved', # loc
         attribute => 'resolved',
-        value     => sub  { return $_[0]->resolved_obj->age_as_string }
+        value     => sub  { return $_[0]->resolved_obj->age }
     },
     starts => {
         title     => 'Starts', # loc

Modified: rt/3.999/trunk/share/html/Ticket/Elements/Reminders
==============================================================================
--- rt/3.999/trunk/share/html/Ticket/Elements/Reminders	(original)
+++ rt/3.999/trunk/share/html/Ticket/Elements/Reminders	Tue Feb 24 21:03:31 2009
@@ -158,7 +158,7 @@
     <input type="text" size="15" name="Reminder-Subject-<% $reminder->id %>" value="<%$reminder->subject%>" /> &bull; 
     <& /Elements/SelectOwner, name => 'Reminder-Owner-'.$reminder->id, queue => $ticket->queue, default => $reminder->owner, default_value => 0  &>
     <& /Elements/SelectDate, name => 'Reminder-Due-'.$reminder->id, default => $reminder->due_obj->date &>
-    (<%$reminder->due_obj->unix>0  ? $reminder->due_obj->age_as_string : '' %>)<br />
+    (<%$reminder->due_obj->unix>0  ? $reminder->due_obj->age : '' %>)<br />
 </%method>
 <%method ShowEntry>
 <%args>
@@ -172,5 +172,5 @@
 /> 
     <%$reminder->subject%> &bull; 
     <%$reminder->owner_obj->name%>
-    <%$reminder->due_obj->unix>0  ? "&bull; ". $reminder->due_obj->age_as_string : '' |n%><br />
+    <%$reminder->due_obj->unix>0  ? "&bull; ". $reminder->due_obj->age : '' |n%><br />
 </%method>

Modified: rt/3.999/trunk/t/api/date.t
==============================================================================
--- rt/3.999/trunk/t/api/date.t	(original)
+++ rt/3.999/trunk/t/api/date.t	Tue Feb 24 21:03:31 2009
@@ -495,7 +495,7 @@
 { # AgeAsString
     my $date = RT::Date->new(current_user => RT->system_user);
     $date->set_to_now;
-    my $diff = $date->age_as_string;
+    my $diff = $date->age;
     like($diff, qr/^(0 sec|[1-5] sec ago)$/, 'close enought');
 }