Changeset 1002 for trunk/LATMOS-Accounts/lib

Timestamp:

05/19/12 11:38:41 (12 years ago)

Author:

nanardon

Message:

• fix attributes object return in some, simplify code

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Files:

• Bases.pm (modified) (1 diff)
• Bases/Objects.pm (modified) (1 diff)
• Bases/Sql/DataRequest.pm (modified) (1 diff)

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

@@ -418 +418 @@
 sub attribute {
     my ($self, $otype, $attribute) = @_;
+
+    my $attrinfo;
+    if (!ref $attribute) {
+       $attrinfo = $self->get_attr_schema($otype, $attribute)
+            or return;
+        $attrinfo->{name} = $attribute;
+    } else {
+        $attrinfo = $attribute;
+    }
+
     return LATMOS::Accounts::Bases::Attributes->new(
-        $attribute,
+        $attrinfo,
         $self,
         $otype,

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

@@ -132 +132 @@
 sub attribute {
     my ($self, $attribute) = @_;
+
+    my $attrinfo;
+    if (! ref $attribute) {
+        $attrinfo = $self->base->get_attr_schema(
+            $self->type, $attribute
+        ) or return;
+        $attrinfo->{name} = $attribute;
+    } else {
+        $attrinfo = $attribute;
+    }
+
     return LATMOS::Accounts::Bases::Attributes->new(
-        $attribute,
+        $attrinfo,
         $self,
     );

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/DataRequest.pm

@@ -505 +505 @@
     } else {
         my $obj = $self->oobject;
-        return $obj
+        my $oo =  $obj
             ? $obj->attribute($attrname)
             : $self->base->attribute($self->otype, $attrname);
+        return $oo || $self->base->attribute($self->otype, { name => $attrname });
     }
 }