[Rt-commit] r18573 - in rt/3.999/trunk: . lib/RT/Condition lib/RT/Interface lib/RT/ScripAction share/html/Approvals/Elements 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:17:10 EST 2009
Author: sartak
Date: Tue Feb 24 21:17:10 2009
New Revision: 18573
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/Interface/Web.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/Approvals/Elements/PendingMyApproval
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/Reminders
rt/3.999/trunk/share/html/Ticket/Elements/ShowDates
rt/3.999/trunk/t/api/date.t
rt/3.999/trunk/t/api/ticket.t
Log:
r80539 at onn: sartak | 2009-02-24 21:17:05 -0500
Dumb replacement of each ->unix with ->epoch
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:17:10 2009
@@ -67,7 +67,7 @@
my $cur = RT::Date->new( RT->system_user );
$cur->set_to_now();
my $due = $self->ticket_obj->due_obj;
- return (undef) if $due->unix <= 0;
+ return (undef) if $due->epoch <= 0;
my $diff = $due->diff($cur);
if ( $diff >= 0 and $diff <= $elapse ) {
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:17:10 2009
@@ -68,8 +68,8 @@
sub is_applicable {
my $self = shift;
- if ( $self->ticket_obj->due_obj->unix > 0
- and $self->ticket_obj->due_obj->unix < time() )
+ if ( $self->ticket_obj->due_obj->epoch > 0
+ and $self->ticket_obj->due_obj->epoch < time() )
{
return (1);
} else {
Modified: rt/3.999/trunk/lib/RT/Interface/Web.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Interface/Web.pm (original)
+++ rt/3.999/trunk/lib/RT/Interface/Web.pm Tue Feb 24 21:17:10 2009
@@ -1349,8 +1349,8 @@
);
my $obj = $field . "_obj";
- if ( ( defined $DateObj->unix )
- and ( $DateObj->unix != $Ticket->$obj()->unix() ) )
+ if ( ( defined $DateObj->epoch )
+ and ( $DateObj->epoch != $Ticket->$obj->epoch ) )
{
my $method = "set_$field";
my ( $code, $msg ) = $Ticket->$method( $DateObj->iso );
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:17:10 2009
@@ -691,7 +691,7 @@
$dateobj->set( format => 'unix', value => $args{$date} );
} else {
eval { $dateobj->set( format => 'iso', value => $args{$date} ); };
- if ( $@ or $dateobj->unix <= 0 ) {
+ if ( $@ or $dateobj->epoch <= 0 ) {
$dateobj->set( format => 'unknown', value => $args{$date} );
}
}
@@ -986,10 +986,10 @@
$string .= "Queue: " . $t->queue . "\n";
$string .= "Subject: " . $t->subject . "\n";
$string .= "Status: " . $t->status . "\n";
- $string .= "Due: " . $t->due_obj->unix . "\n";
+ $string .= "Due: " . $t->due_obj->epoch . "\n";
$string .= "Starts: " . $t->starts->epoch . "\n";
- $string .= "Started: " . $t->started_obj->unix . "\n";
- $string .= "Resolved: " . $t->resolved_obj->unix . "\n";
+ $string .= "Started: " . $t->started_obj->epoch . "\n";
+ $string .= "Resolved: " . $t->resolved_obj->epoch . "\n";
$string .= "Owner: " . $t->owner . "\n";
$string .= "Requestor: " . $t->role_group("requestor")->member_emails_as_string . "\n";
$string .= "Cc: " . $t->role_group("cc")->member_emails_as_string . "\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:17:10 2009
@@ -99,7 +99,7 @@
# If we don't have a due date, adjust the priority by one
# until we hit the final priority
- if ( $due->unix() < 1 ) {
+ if ( $due->epoch < 1 ) {
if ( $self->ticket_obj->priority > $self->ticket_obj->final_priority ) {
$self->{'prio'} = ( $self->ticket_obj->priority - 1 );
return 1;
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:17:10 2009
@@ -157,7 +157,7 @@
my $ticket = $self->ticket_obj;
- my $due = $ticket->due_obj->unix;
+ my $due = $ticket->due_obj->epoch;
unless ( $due > 0 ) {
Jifty->log->debug('Due is not set. Not escalating.');
return 1;
Modified: rt/3.999/trunk/share/html/Approvals/Elements/PendingMyApproval
==============================================================================
--- rt/3.999/trunk/share/html/Approvals/Elements/PendingMyApproval (original)
+++ rt/3.999/trunk/share/html/Approvals/Elements/PendingMyApproval Tue Feb 24 21:17:10 2009
@@ -63,9 +63,9 @@
<input type="checkbox" class="checkbox" value="1" name="show_rejected" <% defined($ARGS{'show_rejected'}) && $ARGS{'show_rejected'} && qq[checked="checked"] |n%> /> <&|/l&>Show denied requests</&><br />
<input type="checkbox" class="checkbox" value="1" name="show_dependent" <% defined($ARGS{'show_dependent'}) && $ARGS{'show_dependent'} && qq[checked="checked"] |n%> /> <&|/l&>Show requests awaiting other approvals</&><br />
-<&|/l,"<input size='15' value='".($Created_before->unix > 0 &&$Created_before->iso)."' name='created_before' id='CreatedBefore' class='datetime' />"&>Only show approvals for requests Created before %1</&><br />
+<&|/l,"<input size='15' value='".($Created_before->epoch > 0 &&$Created_before->iso)."' name='created_before' id='CreatedBefore' class='datetime' />"&>Only show approvals for requests Created before %1</&><br />
-<&|/l, "<input size='15' value='".( $Created_after->unix >0 && $Created_after->iso)."' name='created_after' id='CreatedAfter' class='datetime' />"&>Only show approvals for requests Created after %1</&>
+<&|/l, "<input size='15' value='".( $Created_after->epoch >0 && $Created_after->iso)."' name='created_after' id='CreatedAfter' class='datetime' />"&>Only show approvals for requests Created after %1</&>
</&>
<%init>
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:17:10 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 ? '• '.$reminder->due_obj->age : '' |n %>
+<%$reminder->owner_obj->name %> <%$reminder->due_obj->epoch >0 ? '• '.$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:17:10 2009
@@ -199,7 +199,7 @@
value => sub {
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)) {
+ if ( $date && $date->epoch > 0 && $date->diff < 0 && $_[0]->queue->status_schema->is_active($_[0]->status)) {
return (\'<span class="overdue">' , $date->age , \'</span>');
} else {
return $date->age;
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:17:10 2009
@@ -86,9 +86,9 @@
$feed->add_properties('prodid' => ["-//" . RT->config->get('rtname') ."//"]);
while (my $t = $tickets->next) {
- next unless $t->due_obj->unix > 0;
+ next unless $t->due_obj->epoch > 0;
- my $starttime = $t->starts->unix > 0 ? $t->starts : $t->created;
+ my $starttime = $t->starts->epoch > 0 ? $t->starts : $t->created;
my $now = RT::Date->new; $now->set_to_now;
my $start = Data::ICal::Entry::Event->new;
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:17:10 2009
@@ -77,7 +77,7 @@
while ( my $Ticket = $Tickets->next()) {
my $row;
foreach my $attr (@attrs) {
- if ($attr =~ /(.*)->iso$/ and $Ticket->$1->unix <= 0) {
+ if ($attr =~ /(.*)->iso$/ and $Ticket->$1->epoch <= 0) {
$row->{$attr} = "";
} else {
my $method = '$Ticket->'.$attr.'()';
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:17:10 2009
@@ -158,7 +158,7 @@
<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->unix>0 ? $reminder->due_obj->age : '' %>)<br />
+ (<%$reminder->due_obj->epoch>0 ? $reminder->due_obj->age : '' %>)<br />
</%method>
<%method ShowEntry>
<%args>
@@ -172,5 +172,5 @@
/>
<%$reminder->subject%> •
<%$reminder->owner_obj->name%>
- <%$reminder->due_obj->unix>0 ? "• ". $reminder->due_obj->age : '' |n%><br />
+ <%$reminder->due_obj->epoch>0 ? "• ". $reminder->due_obj->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:17:10 2009
@@ -65,7 +65,7 @@
<tr>
<td class="label date due"><&|/l&>Due</&>:</td>
% my $due = $ticket->due_obj;
-% if ( $due && $due->unix > 0 && $due->diff < 0 ) {
+% if ( $due && $due->epoch > 0 && $due->diff < 0 ) {
<td class="value date due"><span class="overdue"><% $due->as_string %></span></td>
% } else {
<td class="value date due"><% $due->as_string %></td>
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:17:10 2009
@@ -90,7 +90,7 @@
{
my $date = RT::Date->new(current_user => RT->system_user);
- is($date->unix, 0, "new date returns 0 in Unix format");
+ is($date->epoch, 0, "new date returns 0 in Unix format");
is($date->get, '1970-01-01 00:00:00', "default is ISO format");
is($date->get(format =>'SomeBadFormat'),
'1970-01-01 00:00:00',
@@ -222,21 +222,21 @@
# bad format
my $date = RT::Date->new(current_user => RT->system_user);
$date->set( format => 'bad' );
- is($date->unix, undef, "bad format");
+ is($date->epoch, undef, "bad format");
{ # setting value via Unix method
my $date = RT::Date->new(current_user => RT->system_user);
- $date->unix(1);
+ $date->epoch(1);
is($date->iso, '1970-01-01 00:00:01', "correct value");
foreach (undef, 0, ''){
- $date->unix(1);
+ $date->epoch(1);
is($date->iso, '1970-01-01 00:00:01', "correct value");
$date->set(format => 'unix', value => $_);
is($date->iso, '1970-01-01 00:00:00', "Set a date to midnight 1/1/1970 GMT due to wrong call");
- is($date->unix, 0, "unix is 0 => unset");
+ is($date->epoch, 0, "unix is 0 => unset");
}
}
@@ -246,7 +246,7 @@
my $date = RT::Date->new(current_user => RT->system_user);
my $return = $date->set(format => 'ISO', value => 'weird date');
is ($return, undef, "The set failed. returned undef");
- is($date->unix, undef, "date was wrong => unix == 0");
+ is($date->epoch, undef, "date was wrong => unix == 0");
# XXX: ISO format has more feature than we suport
# http://www.cl.cam.ac.uk/~mgk25/iso-time.html
@@ -276,19 +276,19 @@
is($date->iso, $year .'-11-28 15:10:00', "DDMMhh:mm:ss");
$date->set(format => 'ISO', value => '2005-13-28 15:10:00');
- is($date->unix, 0, "wrong month value");
+ is($date->epoch, 0, "wrong month value");
$date->set(format => 'ISO', value => '2005-00-28 15:10:00');
- is($date->unix, 0, "wrong month value");
+ is($date->epoch, 0, "wrong month value");
$date->set(format => 'ISO', value => '1960-01-28 15:10:00');
- is($date->unix, 0, "too old, we don't support");
+ is($date->epoch, 0, "too old, we don't support");
}
{ # set+datemanip format(time::ParseDate)
my $date = RT::Date->new(current_user => RT->system_user);
$date->set(format => 'unknown', value => 'weird date');
- is($date->unix, 0, "date was wrong");
+ is($date->epoch, 0, "date was wrong");
RT->config->set( Timezone => 'Europe/Moscow' );
$date->set(format => 'datemanip', value => '2005-11-28 15:10:00');
@@ -307,7 +307,7 @@
{ # set+unknown format(time::ParseDate)
my $date = RT::Date->new(current_user => RT->system_user);
$date->set(format => 'unknown', value => 'weird date');
- is($date->unix, 0, "date was wrong");
+ is($date->epoch, 0, "date was wrong");
RT->config->set( Timezone => 'Europe/Moscow' );
$date->set(format => 'unknown', value => '2005-11-28 15:10:00');
@@ -379,38 +379,38 @@
my $date = RT::Date->new(current_user => RT->system_user);
my $time = time;
$date->set_to_now;
- ok($date->unix >= $time, 'close enough');
- ok($date->unix < $time+5, 'difference is less than five seconds');
+ ok($date->epoch >= $time, 'close enough');
+ ok($date->epoch < $time+5, 'difference is less than five seconds');
}
{
my $date = RT::Date->new(current_user => RT->system_user);
- $date->unix(0);
+ $date->epoch(0);
$date->add_seconds;
is($date->iso, '1970-01-01 00:00:00', "nothing changed");
$date->add_seconds(0);
is($date->iso, '1970-01-01 00:00:00', "nothing changed");
- $date->unix(0);
+ $date->epoch(0);
$date->add_seconds(5);
is($date->iso, '1970-01-01 00:00:05', "added five seconds");
$date->add_seconds(-2);
is($date->iso, '1970-01-01 00:00:03', "substracted two seconds");
- $date->unix(0);
+ $date->epoch(0);
$date->add_seconds(3661);
is($date->iso, '1970-01-01 01:01:01', "added one hour, minute and a second");
# XXX: TODO, doesn't work with Test::Warn
# TODO: {
# local $TODO = "BUG or subject to change Date handling to support unix time <= 0";
-# $date->unix(0);
+# $date->epoch(0);
# $date->add_seconds(-2);
-# ok($date->unix > 0);
+# ok($date->epoch > 0);
# }
- $date->unix(0);
+ $date->epoch(0);
$date->add_day;
is($date->iso, '1970-01-02 00:00:00', "added one day");
$date->add_days(2);
@@ -418,7 +418,7 @@
$date->add_days(-1);
is($date->iso, '1970-01-03 00:00:00', "substructed one day");
- $date->unix(0);
+ $date->epoch(0);
$date->add_days(31);
is($date->iso, '1970-02-01 00:00:00', "added one month");
}
@@ -429,18 +429,18 @@
is($date->as_string, "Not set", "as_string returns 'Not set'");
RT->config->set( DateTimeFormat => '');
- $date->unix(1);
+ $date->epoch(1);
is($date->as_string, 'Thu Jan 01 00:00:01 1970', "correct string");
is($date->as_string(date => 0), '00:00:01', "correct string");
is($date->as_string(time => 0), 'Thu Jan 01 1970', "correct string");
is($date->as_string(date => 0, time => 0), 'Thu Jan 01 00:00:01 1970', "invalid input");
RT->config->set( DateTimeFormat => 'RFC2822' );
- $date->unix(1);
+ $date->epoch(1);
is($date->as_string, 'Thu, 1 Jan 1970 00:00:01 +0000', "correct string");
RT->config->set( DateTimeFormat => { format => 'RFC2822', seconds => 0 } );
- $date->unix(1);
+ $date->epoch(1);
is($date->as_string, 'Thu, 1 Jan 1970 00:00 +0000', "correct string");
is($date->as_string(seconds => 1), 'Thu, 1 Jan 1970 00:00:01 +0000', "correct string");
}
@@ -472,7 +472,7 @@
is($date->diff_as_string(-1), '', 'no diff, wrong input');
is($date->diff_as_string('qwe'), '', 'no diff, wrong input');
- $date->unix(2);
+ $date->epoch(2);
is($date->diff_as_string(-1), '', 'no diff, wrong input');
is($date->diff_as_string(3), '1 sec ago', 'diff: 1 sec ago');
@@ -480,7 +480,7 @@
my $ndate = RT::Date->new(current_user => RT->system_user);
is($date->diff_as_string($ndate), '', 'no diff, wrong input');
- $ndate->unix(3);
+ $ndate->epoch(3);
is($date->diff_as_string($ndate), '1 sec ago', 'diff: 1 sec ago');
}
Modified: rt/3.999/trunk/t/api/ticket.t
==============================================================================
--- rt/3.999/trunk/t/api/ticket.t (original)
+++ rt/3.999/trunk/t/api/ticket.t Tue Feb 24 21:17:10 2009
@@ -96,7 +96,7 @@
ok ( my $id = $t->id, "Got ticket id");
like ($t->refers_to->first->target , qr/fsck.com/, "Got refers to");
like ($t->referred_to_by->first->base , qr/cpan.org/, "Got referredtoby");
-is ($t->resolved_obj->unix, 0, "It hasn't been resolved - ". $t->resolved_obj->unix);
+is ($t->resolved_obj->epoch, 0, "It hasn't been resolved - ". $t->resolved_obj->epoch);
my $ticket = RT::Model::Ticket->new(current_user => RT->system_user);
More information about the Rt-commit
mailing list