X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDB%2FObject.pm;h=0a698268ca91ffcb02df64f1a2f11a56666a832e;hb=47a963f4da66588e72124424e0e5e58577894eb5;hp=1a39431c6d1cb2f42acff6e8ebab519e48237106;hpb=82515b2d93dc5632f24d6e0b6f8f05f3fd19fbb0;p=kivitendo-erp.git diff --git a/SL/DB/Object.pm b/SL/DB/Object.pm index 1a39431c6..0a698268c 100644 --- a/SL/DB/Object.pm +++ b/SL/DB/Object.pm @@ -7,11 +7,9 @@ use Rose::DB::Object; use List::MoreUtils qw(any); use SL::DB; -use SL::DB::Helpers::AttrNumber; -use SL::DB::Helpers::AttrDate; -use SL::DB::Helpers::AttrPercent; -use SL::DB::Helpers::Metadata; -use SL::DB::Helpers::Manager; +use SL::DB::Helper::Attr; +use SL::DB::Helper::Metadata; +use SL::DB::Helper::Manager; use base qw(Rose::DB::Object); @@ -27,13 +25,13 @@ sub new { sub init_db { my $class_or_self = shift; my $class = ref($class_or_self) || $class_or_self; - my $type = 'LXOFFICE'; + my $type = $class =~ m/::Auth/ ? 'LXOFFICE_AUTH' : 'LXOFFICE'; return SL::DB::create(undef, $type); } sub meta_class { - return 'SL::DB::Helpers::Metadata'; + return 'SL::DB::Helper::Metadata'; } sub _get_manager_class { @@ -63,9 +61,10 @@ sub _assign_attributes { while (my ($attribute, $value) = each %attributes) { my $type = lc($types{$attribute} || 'text'); - $value = $type eq 'boolean' ? ($value ? 't' : 'f') - : $text_column_types{$type} ? $value - : ($value || undef); + $value = $type eq 'boolean' ? ($value ? 't' : 'f') + : $text_column_types{$type} ? $value + : defined($value) && ($value eq '') ? undef + : $value; $self->$attribute($value); } @@ -80,18 +79,6 @@ sub update_attributes { return $self; } -sub attr_number { - SL::DB::Helpers::AttrNumber::define(@_); -} - -sub attr_date { - SL::DB::Helpers::AttrDate::define(@_); -} - -sub attr_percent { - SL::DB::Helpers::AttrPercent::define(@_); -} - 1; __END__