Changeset 2414

Timestamp:

06/24/20 22:12:43 (4 years ago)

Author:

nanardon

Message:

Fix: attribute not compute after employment changes

Location:

trunk/LATMOS-Accounts

Files:

• Changes (modified) (1 diff)
• lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (8 diffs)
• lib/LATMOS/Accounts/Bases/Sql/objects.pm (modified) (1 diff)

trunk/LATMOS-Accounts/Changes

@@ -16 +16 @@
     - add groupOfnames object support for LDAP
     - always try to create missing object in destination (regardless recent changes)
-    - Fix: dynamics attributes not properly compute after object creation
+    - Fix: dynamics attributes not properly compute after object creation and employment changes
     - add support objects (hardare support contact)
 

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

@@ -1746 +1746 @@
         # If an employement apply we set the value to the user object
 
-        $self->_computeEmploymentDate;
+        my $res = $self->_computeEmploymentDate;
 
         my %attrsets = (
@@ -1770 +1770 @@
 
         if (keys %attrsets) {
-            if (my $res = $self->set_fields(%attrsets)) {
+            if (my $cres = $self->set_fields(%attrsets)) {
+                $res += $cres;
                 $self->ReportChange('Update', 'Attr %s updated to match Employment %s', join(', ', sort keys %attrsets), $currentemployment->id);
-                $self->PostSetAttribute();
-                return $res;
             }
-        } else {
-            return 1;
-        }
+        }
+
+        $self->PostSetAttribute() if ($res);
     } else {
         # No current employment, resetting values:
@@ -1783 +1782 @@
         return $self->resetEmployment;
     }
-
 }
 
@@ -1795 +1793 @@
     my ($self) = @_;
 
-    $self->_computeEmploymentDate;
+    my $res = $self->_computeEmploymentDate;
 
     my %changes = (
@@ -1836 +1834 @@
 
     if (%changes) {
-        if ($self->set_fields(%changes)) {
+        if (my $cres += $self->set_fields(%changes)) {
+            $res += $cres;
             $self->base->log(LA_NOTICE, "Updating user %s to match unemployment", $self->id);
             $self->ReportChange('Update', 'Update %s to match unemployment', join(', ', sort keys %changes));
-            $self->PostSetAttribute();
-            return 1;
-        } else {
-            return 0;
-        }
-    } else {
-        return 1;
-    }
-
+        }
+    }
+    $self->PostSetAttribute() if ($res);
+
+    return $res;
 }
 
@@ -1918 +1913 @@
     }
 
+    my $res = 0;
     if (keys %changes) {
         $self->base->log(LA_DEBUG, 'Applying employment state to user %s for field %s', $self->id, join(', ', keys %changes));
@@ -1925 +1921 @@
             $self->base->log(LA_DEBUG, 'New expiration is %s for user %s', ($changes{expire} || '(none)'), $self->id);
         }
-        $self->set_fields(%changes);
+        $res += $self->set_fields(%changes);
     } else {
         $self->base->log(LA_DEBUG, 'No employment change for user %s', $self->id);
@@ -1932 +1928 @@
     $self->_computeEmploymentHistory();
 
-    return 1;
+    return $res;
 }
 

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

@@ -839 +839 @@
     my %data;
 
+    $self->base->log(LA_DEBUG, "Running PostSetAttribute for %s/%s", $self->type, $self->id);
+
     my %AttrToCompute;
     foreach my $attr ($self->base->list_canonical_fields($self->type, 'r')) {