diff options
| -rw-r--r-- | lib/Reaction/Types/DateTime.pm | 4 | ||||
| -rw-r--r-- | lib/Reaction/UI/ViewPort/Action.pm | 2 | ||||
| -rw-r--r-- | lib/Reaction/UI/ViewPort/Collection/Grid/Member.pm | 2 | ||||
| -rw-r--r-- | lib/Reaction/UI/ViewPort/Field/DateTime.pm | 4 | ||||
| -rw-r--r-- | lib/Reaction/UI/ViewPort/Object.pm | 2 | ||||
| -rw-r--r-- | t/lib/RTest/TestDB/Bar.pm | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/lib/Reaction/Types/DateTime.pm b/lib/Reaction/Types/DateTime.pm index d6294d2..ef944cc 100644 --- a/lib/Reaction/Types/DateTime.pm +++ b/lib/Reaction/Types/DateTime.pm @@ -1,12 +1,12 @@ package Reaction::Types::DateTime; use MooseX::Types - -declare => [qw/DateTime SpanSet TimeRangeCollection/]; + -declare => [qw/DateTimeObject SpanSet TimeRangeCollection/]; use MooseX::Types::Moose qw/Object ArrayRef/; use DateTime; -subtype DateTime, +subtype DateTimeObject, as Object, where { $_->isa('DateTime') }, message { "Must be of the form YYYY-MM-DD HH:MM:SS" }; diff --git a/lib/Reaction/UI/ViewPort/Action.pm b/lib/Reaction/UI/ViewPort/Action.pm index 1e92025..5e4b0f0 100644 --- a/lib/Reaction/UI/ViewPort/Action.pm +++ b/lib/Reaction/UI/ViewPort/Action.pm @@ -164,7 +164,7 @@ class Action is Object, which { $self->_build_simple_field(attribute => $attr, class => Password, %$args); }; - implements _build_fields_for_type_Reaction_Types_DateTime_DateTime => as { + implements _build_fields_for_type_Reaction_Types_DateTime_DateTimeObject => as { my ($self, $attr, $args) = @_; $self->_build_simple_field(attribute => $attr, class => DateTime, %$args); }; diff --git a/lib/Reaction/UI/ViewPort/Collection/Grid/Member.pm b/lib/Reaction/UI/ViewPort/Collection/Grid/Member.pm index aae25dd..8696faa 100644 --- a/lib/Reaction/UI/ViewPort/Collection/Grid/Member.pm +++ b/lib/Reaction/UI/ViewPort/Collection/Grid/Member.pm @@ -32,7 +32,7 @@ class Member is 'Reaction::UI::ViewPort::Object', which { $_[0]->(@_[1,2], { layout => 'value/string', %{ $_[3] || {} } }) }; - around _build_fields_for_type_Reaction_Types_DateTime_DateTime => sub { + around _build_fields_for_type_Reaction_Types_DateTime_DateTimeObject => sub { $_[0]->(@_[1,2], { layout => 'value/date_time', %{ $_[3] || {} } }) }; diff --git a/lib/Reaction/UI/ViewPort/Field/DateTime.pm b/lib/Reaction/UI/ViewPort/Field/DateTime.pm index 50d26cf..4a932f2 100644 --- a/lib/Reaction/UI/ViewPort/Field/DateTime.pm +++ b/lib/Reaction/UI/ViewPort/Field/DateTime.pm @@ -2,11 +2,11 @@ package Reaction::UI::ViewPort::Field::DateTime; use Scalar::Util 'blessed'; use Reaction::Class; -use Reaction::Types::DateTime; +use Reaction::Types::DateTime 'DateTimeObject'; use aliased 'Reaction::UI::ViewPort::Field'; class DateTime is Field, which { - has '+value' => (isa => DateTime); + has '+value' => (isa => DateTimeObject); has value_string_default_format => ( isa => 'Str', is => 'rw', required => 1, default => sub { "%F %H:%M:%S" } diff --git a/lib/Reaction/UI/ViewPort/Object.pm b/lib/Reaction/UI/ViewPort/Object.pm index 4fa04d9..73facb9 100644 --- a/lib/Reaction/UI/ViewPort/Object.pm +++ b/lib/Reaction/UI/ViewPort/Object.pm @@ -157,7 +157,7 @@ class Object is 'Reaction::UI::ViewPort', which { $self->_build_simple_field(attribute => $attr, class => String, %$args); }; - implements _build_fields_for_type_Reaction_Types_DateTime_DateTime => as { + implements _build_fields_for_type_Reaction_Types_DateTime_DateTimeObject => as { my ($self, $attr, $args) = @_; $self->_build_simple_field(attribute => $attr, class => DateTime, %$args); }; diff --git a/t/lib/RTest/TestDB/Bar.pm b/t/lib/RTest/TestDB/Bar.pm index ab36958..d841696 100644 --- a/t/lib/RTest/TestDB/Bar.pm +++ b/t/lib/RTest/TestDB/Bar.pm @@ -6,12 +6,12 @@ use DBIx::Class 0.07; use base qw/DBIx::Class Reaction::Object/; use Reaction::Class; use Reaction::Types::Core 'NonEmptySimpleStr'; -use Reaction::Types::DateTime 'DateTime'; +use Reaction::Types::DateTime 'DateTimeObject'; use Reaction::Types::File 'File'; has 'name' => (isa => NonEmptySimpleStr, is => 'rw', required => 1); has 'foo' => (isa => 'RTest::TestDB::Foo', is => 'rw', required => 1); -has 'published_at' => (isa => DateTime, is => 'rw'); +has 'published_at' => (isa => DateTimeObject, is => 'rw'); has 'avatar' => (isa => File, is => 'rw'); __PACKAGE__->load_components(qw/InflateColumn::DateTime Core/); |