Changeset 2265

Timestamp:

06/19/19 11:49:49 (5 years ago)

Author:

nanardon

Message:

Fix address change propagation

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql

Files:

• User.pm (modified) (14 diffs)
• objects.pm (modified) (3 diffs)

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

@@ -126 +126 @@
                         );
                     }
-                    foreach my $al ($self->object->get_attributes('otheraddress')) {
+                    foreach my $al ($self->object->get_attributes('_otheraddress')) {
                         my $obj = $self->base->get_object('address', $al) or next;
                         $obj->_set_c_fields(
@@ -769 +769 @@
                 get => sub {
                     my ($self) = @_;
-                    if (my $fmainaddress = $self->object->_get_c_field('mainaddress')) {
+                    if (my $fmainaddress = $self->object->_get_c_field('_mainaddress')) {
                         $self->base->get_object('address', $fmainaddress)
                             ->_get_c_field($self->name);
@@ -782 +782 @@
                 get => sub {
                     my ($self) = @_;
-                    if (my $fmainaddress = $self->object->_get_c_field('mainaddress')) {
+                    if (my $fmainaddress = $self->object->_get_c_field('_mainaddress')) {
                         $self->base->get_object('address', $fmainaddress)
                             ->_get_c_field($self->name);
@@ -794 +794 @@
                 get => sub {
                     my ($self) = @_;
-                    if (my $fmainaddress = $self->object->_get_c_field('mainaddress')) {
+                    if (my $fmainaddress = $self->object->_get_c_field('_mainaddress')) {
                         $self->base->get_object('address', $fmainaddress)
                             ->_get_c_field($self->name);
@@ -807 +807 @@
                 get => sub {
                     my ($self) = @_;
-                    if (my $fmainaddress = $self->object->_get_c_field('mainaddress')) {
+                    if (my $fmainaddress = $self->object->_get_c_field('_mainaddress')) {
                         $self->base->get_object('address', $fmainaddress)
                             ->_get_c_field($self->name);
@@ -821 +821 @@
                 get => sub {
                     my ($self) = @_;
-                    if (my $fmainaddress = $self->object->_get_c_field('mainaddress')) {
+                    if (my $fmainaddress = $self->object->_get_c_field('_mainaddress')) {
                         $self->base->get_object('address', $fmainaddress)
                             ->_get_c_field($self->name);
@@ -834 +834 @@
                 get => sub {
                     my ($self) = @_;
-                    if (my $fmainaddress = $self->object->_get_c_field('mainaddress')) {
+                    if (my $fmainaddress = $self->object->_get_c_field('_mainaddress')) {
                         $self->base->get_object('address', $fmainaddress)
                             ->_get_c_field($self->name);
@@ -847 +847 @@
                 get => sub {
                     my ($self) = @_;
-                    if (my $fmainaddress = $self->object->_get_c_field('mainaddress')) {
+                    if (my $fmainaddress = $self->object->_get_c_field('_mainaddress')) {
                         $self->base->get_object('address', $fmainaddress)
                             ->_get_c_field($self->name);
@@ -859 +859 @@
                 get => sub {
                     my ($self) = @_;
-                    if (my $fmainaddress = $self->object->_get_c_field('mainaddress')) {
+                    if (my $fmainaddress = $self->object->_get_c_field('_mainaddress')) {
                         $self->base->get_object('address', $fmainaddress)
                             ->_get_c_field($self->name);
@@ -882 +882 @@
                 get => sub {
                     my ($self) = @_;
-                    if (my $fmainaddress = $self->object->_get_c_field('mainaddress')) {
+                    if (my $fmainaddress = $self->object->_get_c_field('_mainaddress')) {
                         $self->base->get_object('address', $fmainaddress)
                             ->_get_c_field($self->name);
@@ -895 +895 @@
                 get => sub {
                     my ($self) = @_;
-                    if (my $fmainaddress = $self->object->_get_c_field('mainaddress')) {
+                    if (my $fmainaddress = $self->object->_get_c_field('_mainaddress')) {
                         $self->base->get_object('address', $fmainaddress)
                             ->_get_c_field($self->name);
@@ -1069 +1069 @@
             managedObjects => { ro => 1, reference => 'group', },
             otheraddress => {
+                auto => 1,
+                multiple => 1,
+                reference => 'address',
+            },
+            _otheraddress => {
                 ro => 1,
                 multiple => 1,
@@ -1090 +1095 @@
                 },
             },
-            mainaddress => { auto => 1 },
+            mainaddress => {
+                auto => 1,
+                reference => 'address',
+            },
             _mainaddress => {
                 hide => 1,
@@ -1115 +1123 @@
                 get => sub {
                     my ($self) = @_;
-                    if (my $fmainaddress = $self->object->_get_c_field('mainaddress')) {
+                    if (my $fmainaddress = $self->object->_get_c_field('_mainaddress')) {
                         $self->base->get_object('address', $fmainaddress)
-                            ->_get_c_field($self->name);
+                            ->_get_c_field('postalAddress');
                     } else {
                         return;

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

@@ -454 +454 @@
     }
 
+    my @parents = $obj->ParentObject;
+
     my $sthd = $base->db->prepare_cached(
         sprintf(
@@ -464 +466 @@
     if ($res) {
         delete($__cache->{$id});
+    }
+
+    foreach my $pobj (@parents) {
+        $res += $pobj->PostSetAttribute;
     }
 
@@ -795 +801 @@
     my $res =  $self->set_fields(%data);
 
+    if (my $obj = $self->ParentObject) {
+        $res += $obj->PostSetAttribute;
+    }
+
     return $res ? $res : 'OEO';
 }