Changeset 1564 for trunk

Timestamp:

12/30/15 13:56:53 (9 years ago)

Author:

nanardon

Message:

Always return array is attribute is multivalued

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Attributes.pm (modified) (1 diff)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Attributes.pm

@@ -441 +441 @@
 
     if (defined($self->object)) {
-        if (ref($self->{get}) eq 'CODE') {
-            return $self->{get}->($self);
+        my $res = (ref($self->{get}) eq 'CODE')
+            ? $self->{get}->($self)
+            : $self->object->get_field($self->iname);
+
+        # always return undef if empty
+        # and an array if attribute is multivalued
+        if (!$res) {
+            return undef;
+        } elsif (ref $res) {
+            return @{$res} ? $res : undef;
+        } elsif ($self->multiple) {
+            return ref $res ? $res : [$res]
         } else {
-            return $self->object->get_field($self->iname);
+            return $res;
         }
     } else {