[Jifty-commit] r4245 - in jifty/trunk: . t/TestApp/lib/TestApp/Model

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Tue Oct 16 17:31:36 EDT 2007


Author: sartak
Date: Tue Oct 16 17:31:35 2007
New Revision: 4245

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Filter/DateTime.pm
   jifty/trunk/t/TestApp/lib/TestApp/Model/User.pm

Log:
 r43759 at onn:  sartak | 2007-10-16 17:31:18 -0400
 Make sure Jifty::Filter::DateTime doesn't disturb Floating datetimes
 Otherwise, dates would get set to the current_user's timezone, throwing a wrench in the works


Modified: jifty/trunk/lib/Jifty/Filter/DateTime.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Filter/DateTime.pm	(original)
+++ jifty/trunk/lib/Jifty/Filter/DateTime.pm	Tue Oct 16 17:31:35 2007
@@ -48,6 +48,10 @@
         $args{$_} = $$value_ref->$_ if(defined($$value_ref->$_));
     }
 
+    # the floating timezone indicates a date, so we don't want to set any
+    # other timezone on it
+    $args{time_zone} = 'floating' if $$value_ref->time_zone =~ /floating/i;
+
     my $dt = Jifty::DateTime->new(%args);
 
     $$value_ref = $dt;

Modified: jifty/trunk/t/TestApp/lib/TestApp/Model/User.pm
==============================================================================
--- jifty/trunk/t/TestApp/lib/TestApp/Model/User.pm	(original)
+++ jifty/trunk/t/TestApp/lib/TestApp/Model/User.pm	Tue Oct 16 17:31:35 2007
@@ -33,7 +33,7 @@
   type is 'datetime',
   is immutable,
   default is defer { DateTime->now },
-  filters are 'Jifty::DBI::Filter::DateTime';
+  filters are qw(Jifty::Filter::DateTime Jifty::DBI::Filter::Date);
 column 'uuid' => is UUID;
 };
 


More information about the Jifty-commit mailing list