Changeset 1002 for trunk

Timestamp:

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

Author:

nanardon

Message:

• fix attributes object return in some, simplify code

Location:

trunk

Files:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm (modified) (2 diffs)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases.pm (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Objects.pm (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/DataRequest.pm (modified) (1 diff)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm

@@ -474 +474 @@
     my ($self, $attr, $type) = @_;
 
-    my $attribute = ($type
-        ? ref $type
-            ? $self->base->attribute(
+    my $attribute;
+    if ($type) {
+        if (ref $type) {
+            $attribute = $self->base->attribute(
                 $self->otype,
-                { %$type, name => $attr },)
-            : $self->base->attribute(
+                { %$type, name => $attr },
+            );
+        } else {
+            $attribute =  $self->base->attribute(
                 $self->otype,
-                { formtype => $type , name => $attr },)
-        : ($self->{object}
-            ? $self->{object}->attribute($attr)
-            : $self->base->attribute($self->otype, $attr, { formtype => $type })))
-        || $self->base->attribute($self->otype, { name => $attr });
+                { formtype => $type , name => $attr },
+            );
+        }
+    } else {
+        if ($self->{object}) {
+            $attribute = $self->{object}->attribute($attr);
+        } else {
+            $attribute = $self->base->attribute(
+                $self->otype, $attr,
+                { formtype => $type }
+            );
+        }
+    }
+    $attribute ||= $self->base->attribute($self->otype, { name => $attr });
 
 
@@ -494 +506 @@
     # Force Array context:
     my @attr_raw_value = ();
+
     if ($attribute->multiple) {
         @attr_raw_value = grep { $_ } $self->attr_raw_value($attribute);

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 });
     }
 }