[Rt-commit] r18578 - in rt/3.999/trunk: . lib/RT/Condition lib/RT/Model share/html/Elements share/html/Elements/RT__Model__Ticket share/html/NoAuth/iCal share/html/Search share/html/Ticket/Elements
sartak at bestpractical.com
sartak at bestpractical.com
Tue Feb 24 21:35:36 EST 2009
Author: sartak
Date: Tue Feb 24 21:35:36 2009
New Revision: 18578
Modified:
rt/3.999/trunk/ (props changed)
rt/3.999/trunk/lib/RT/Condition/BeforeDue.pm
rt/3.999/trunk/lib/RT/Condition/Overdue.pm
rt/3.999/trunk/lib/RT/Model/Ticket.pm
rt/3.999/trunk/lib/RT/ScripAction/CreateTickets.pm
rt/3.999/trunk/lib/RT/ScripAction/EscalatePriority.pm
rt/3.999/trunk/lib/RT/ScripAction/LinearEscalate.pm
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/NoAuth/iCal/dhandler
rt/3.999/trunk/share/html/Search/Results.tsv
rt/3.999/trunk/share/html/Ticket/Elements/EditDates
rt/3.999/trunk/share/html/Ticket/Elements/Reminders
rt/3.999/trunk/share/html/Ticket/Elements/ShowDates
Log:
r80549 at onn: sartak | 2009-02-24 21:35:31 -0500
Kill due_obj, the last of the ${date}_obj methods
Modified: rt/3.999/trunk/lib/RT/Condition/BeforeDue.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Condition/BeforeDue.pm (original)
+++ rt/3.999/trunk/lib/RT/Condition/BeforeDue.pm Tue Feb 24 21:35:36 2009
@@ -66,7 +66,7 @@
my $cur = RT::Date->new( RT->system_user );
$cur->set_to_now();
- my $due = $self->ticket_obj->due_obj;
+ my $due = $self->ticket_obj->due;
return (undef) if $due->epoch <= 0;
my $diff = $due->diff($cur);
Modified: rt/3.999/trunk/lib/RT/Condition/Overdue.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Condition/Overdue.pm (original)
+++ rt/3.999/trunk/lib/RT/Condition/Overdue.pm Tue Feb 24 21:35:36 2009
@@ -68,8 +68,8 @@
sub is_applicable {
my $self = shift;
- if ( $self->ticket_obj->due_obj->epoch > 0
- and $self->ticket_obj->due_obj->epoch < time() )
+ if ( $self->ticket_obj->due->epoch > 0
+ and $self->ticket_obj->due->epoch < time() )
{
return (1);
} else {
Modified: rt/3.999/trunk/lib/RT/Model/Ticket.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Model/Ticket.pm (original)
+++ rt/3.999/trunk/lib/RT/Model/Ticket.pm Tue Feb 24 21:35:36 2009
@@ -1365,29 +1365,6 @@
-=head2 due_obj
-
- Returns an RT::Date object containing this ticket's due date
-
-=cut
-
-sub due_obj {
- my $self = shift;
-
- my $time = RT::Date->new();
-
- # -1 is RT::Date slang for never
- if ( my $due = $self->due ) {
- $time->set( format => 'sql', value => $due );
- } else {
- $time->set( format => 'unix', value => -1 );
- }
-
- return $time;
-}
-
-
-
=head2 set_started
Takes a date in ISO format or undef
Modified: rt/3.999/trunk/lib/RT/ScripAction/CreateTickets.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/ScripAction/CreateTickets.pm (original)
+++ rt/3.999/trunk/lib/RT/ScripAction/CreateTickets.pm Tue Feb 24 21:35:36 2009
@@ -935,7 +935,7 @@
$string .= "UpdateType: correspond\n";
$string .= "Content: \n";
$string .= "ENDOFCONTENT\n";
- $string .= "Due: " . $t->due_obj->as_string . "\n";
+ $string .= "Due: " . $t->due . "\n";
$string .= "Starts: " . $t->starts . "\n";
$string .= "Started: " . $t->started . "\n";
$string .= "Resolved: " . $t->resolved . "\n";
@@ -986,7 +986,7 @@
$string .= "Queue: " . $t->queue . "\n";
$string .= "Subject: " . $t->subject . "\n";
$string .= "Status: " . $t->status . "\n";
- $string .= "Due: " . $t->due_obj->epoch . "\n";
+ $string .= "Due: " . $t->due->epoch . "\n";
$string .= "Starts: " . $t->starts->epoch . "\n";
$string .= "Started: " . $t->started->epoch . "\n";
$string .= "Resolved: " . $t->resolved->epoch . "\n";
Modified: rt/3.999/trunk/lib/RT/ScripAction/EscalatePriority.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/ScripAction/EscalatePriority.pm (original)
+++ rt/3.999/trunk/lib/RT/ScripAction/EscalatePriority.pm Tue Feb 24 21:35:36 2009
@@ -95,7 +95,7 @@
}
#compute the number of days until the ticket is due
- my $due = $self->ticket_obj->due_obj();
+ my $due = $self->ticket_obj->due;
# If we don't have a due date, adjust the priority by one
# until we hit the final priority
Modified: rt/3.999/trunk/lib/RT/ScripAction/LinearEscalate.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/ScripAction/LinearEscalate.pm (original)
+++ rt/3.999/trunk/lib/RT/ScripAction/LinearEscalate.pm Tue Feb 24 21:35:36 2009
@@ -157,7 +157,7 @@
my $ticket = $self->ticket_obj;
- my $due = $ticket->due_obj->epoch;
+ my $due = $ticket->due->epoch;
unless ( $due > 0 ) {
Jifty->log->debug('Due is not set. Not escalating.');
return 1;
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:35:36 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->epoch >0 ? '• '.$reminder->due_obj->age : '' |n %>
+<%$reminder->owner_obj->name %> <%$reminder->due->epoch >0 ? '• '.$reminder->due->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:35:36 2009
@@ -197,7 +197,7 @@
title => 'Due', # loc
attribute => 'Due',
value => sub {
- my $date = $_[0]->due_obj;
+ my $date = $_[0]->due;
# Highlight the date if it was due in the past, and it's still active
if ( $date && $date->epoch > 0 && $date->diff < 0 && $_[0]->queue->status_schema->is_active($_[0]->status)) {
return (\'<span class="overdue">' , $date->age , \'</span>');
@@ -229,7 +229,7 @@
due => {
title => 'Due', # loc
attribute => 'Due',
- value => sub { return $_[0]->due_obj->as_string }
+ value => sub { return $_[0]->due }
},
resolved => {
title => 'Resolved', # loc
Modified: rt/3.999/trunk/share/html/NoAuth/iCal/dhandler
==============================================================================
--- rt/3.999/trunk/share/html/NoAuth/iCal/dhandler (original)
+++ rt/3.999/trunk/share/html/NoAuth/iCal/dhandler Tue Feb 24 21:35:36 2009
@@ -86,7 +86,7 @@
$feed->add_properties('prodid' => ["-//" . RT->config->get('rtname') ."//"]);
while (my $t = $tickets->next) {
- next unless $t->due_obj->epoch > 0;
+ next unless $t->due->epoch > 0;
my $starttime = $t->starts->epoch > 0 ? $t->starts : $t->created;
@@ -108,8 +108,8 @@
);
$end->add_properties(
summary => "Due: ".$t->subject,
- dtstart => $t->due_obj->iCalDate,
- dtend => $t->due_obj->iCalDate,
+ dtstart => $t->due->iCalDate,
+ dtend => $t->due->iCalDate,
);
$feed->add_entry($start);
Modified: rt/3.999/trunk/share/html/Search/Results.tsv
==============================================================================
--- rt/3.999/trunk/share/html/Search/Results.tsv (original)
+++ rt/3.999/trunk/share/html/Search/Results.tsv Tue Feb 24 21:35:36 2009
@@ -71,7 +71,7 @@
my @attrs = qw( id queue_obj->name subject status time_estimated time_worked time_left priority final_priority owner_obj->name
requestors->member_emails_as_string cc->member_emails_as_string admin_cc->member_emails_as_string
- due_obj->iso told->iso created->iso resolved->iso last_updated->iso);
+ due->iso told->iso created->iso resolved->iso last_updated->iso);
$r->content_type('application/vnd.ms-excel');
while ( my $Ticket = $Tickets->next()) {
Modified: rt/3.999/trunk/share/html/Ticket/Elements/EditDates
==============================================================================
--- rt/3.999/trunk/share/html/Ticket/Elements/EditDates (original)
+++ rt/3.999/trunk/share/html/Ticket/Elements/EditDates Tue Feb 24 21:35:36 2009
@@ -67,7 +67,7 @@
<tr>
<td class="label"><&|/l&>Due</&>:</td>
<td class="entry">
- <& /Elements/SelectDate, menu_prefix => 'due', current => 0 &> (<% $ticket_obj->due_obj->as_string %>)
+ <& /Elements/SelectDate, menu_prefix => 'due', current => 0 &> (<% $ticket_obj->due %>)
</td>
</tr>
</table>
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:35:36 2009
@@ -76,26 +76,26 @@
$reminder->set_owner( $request_args->{ 'Reminder-Owner-' . $reminder->id } , "Force" ) ;
}
- if ( exists( $request_args->{ 'Reminder-Due-' . $reminder->id } ) && ( $reminder->due_obj->date ne $request_args->{ 'Reminder-Due-' . $reminder->id } )) {
+ if ( exists( $request_args->{ 'Reminder-Due-' . $reminder->id } ) && ( $reminder->due->date ne $request_args->{ 'Reminder-Due-' . $reminder->id } )) {
$reminder->set_due( $request_args->{ 'Reminder-Due-' . $reminder->id } ) ;
}
}
}
if ( $request_args->{'NewReminder-Subject'} ) {
- my $due_obj = RT::Date->new();
+ my $due = RT::Date->new();
my $date = Time::ParseDate::parsedate(
$request_args->{'NewReminder-Due'},
UK => RT->config->get('DateDayBeforeMonth'),
PREFER_PAST => 0,
PREFER_FUTURE => 1
);
- $due_obj->set( value => $date, format => 'unix' );
+ $due->set( value => $date, format => 'unix' );
my ( $add_id, $msg, $txnid ) = $ticket->reminders->add(
subject => $request_args->{'NewReminder-Subject'},
owner => $request_args->{'NewReminder-Owner'},
- due => $due_obj->iso
+ due => $due->iso
);
}
@@ -157,8 +157,8 @@
/>
<input type="text" size="15" name="Reminder-Subject-<% $reminder->id %>" value="<%$reminder->subject%>" /> •
<& /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->epoch>0 ? $reminder->due_obj->age : '' %>)<br />
+ <& /Elements/SelectDate, name => 'Reminder-Due-'.$reminder->id, default => $reminder->due->date &>
+ (<%$reminder->due->epoch>0 ? $reminder->due->age : '' %>)<br />
</%method>
<%method ShowEntry>
<%args>
@@ -172,5 +172,5 @@
/>
<%$reminder->subject%> •
<%$reminder->owner_obj->name%>
- <%$reminder->due_obj->epoch>0 ? "• ". $reminder->due_obj->age : '' |n%><br />
+ <%$reminder->due->epoch>0 ? "• ". $reminder->due->age : '' |n%><br />
</%method>
Modified: rt/3.999/trunk/share/html/Ticket/Elements/ShowDates
==============================================================================
--- rt/3.999/trunk/share/html/Ticket/Elements/ShowDates (original)
+++ rt/3.999/trunk/share/html/Ticket/Elements/ShowDates Tue Feb 24 21:35:36 2009
@@ -64,7 +64,7 @@
</tr>
<tr>
<td class="label date due"><&|/l&>Due</&>:</td>
-% my $due = $ticket->due_obj;
+% my $due = $ticket->due;
% if ( $due && $due->epoch > 0 && $due->diff < 0 ) {
<td class="value date due"><span class="overdue"><% $due->as_string %></span></td>
% } else {
More information about the Rt-commit
mailing list