Changeset 2264

Timestamp:

06/19/19 10:52:53 (5 years ago)

Author:

nanardon

Message:

Fix otheraddress attribute issue

Location:

trunk

Files:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Users.pm (modified) (1 diff)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Attributes.pm (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (2 diffs)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Users.pm

@@ -230 +230 @@
     my $base = $c->model('Accounts')->db;
 
-    $c->stash->{address} = $base->get_object('address', $arg);
-    $c->stash->{form} = $c->model('AttrForms', 'address',
-        $c->stash->{address});
-    $c->stash->{form}->set_attrs;
+    if ($c->stash->{address} = $base->get_object('address', $arg)) {
+        $c->stash->{form} = $c->model('AttrForms', 'address',
+            $c->stash->{address});
+        $c->stash->{form}->set_attrs;
+    }
 }
 

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

@@ -299 +299 @@
     $new->{form} = $form;
     $new->{object} = $object if (ref $object);
-    $new->{base} = $base || (ref $object ? $object->base : undef) or return $self;
+    $new->{base} = $base || (ref $object ? $object->base : $c->model('Accounts')->db);
     $new->{otype} = ref $object ? $object->type : $object;
 

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

@@ -45 +45 @@
     $attr_info->{_otype}      = $otype;
     $attr_info->{monitored} ||= $base->config('monitored')->{ lc( $otype . '.' . $attributes ) };
-    $attr_info->{ro}          = 1 if ($attr_info->{auto});
+    $attr_info->{ro}          = 1 if ($attr_info->{auto}          && !defined($attr_info->{ro}));
+    $attr_info->{hide}        = 1 if ($attr_info->{_name} =~ /^_/ && !defined($attr_info->{hide}));
 
     return bless($attr_info, $class);

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

@@ -1070 +1070 @@
             otheraddress => {
                 ro => 1,
-                auto => 1,
-            },
-            _otheraddress => {
-                ro => 1,
-                hide => 1,
+                multiple => 1,
                 reference => 'address',
                 get => sub {
@@ -1111 +1107 @@
                 },
             },
-            postalAddress => { auto => 1 },
+            postalAddress => {
+                auto => 1,
+            },
             _postalAddress => {
                 hide => 1,