Changeset 1947

Timestamp:

02/14/17 19:37:35 (7 years ago)

Author:

nanardon

Message:

Fix object deref

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (2 diffs)

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

@@ -1530 +1530 @@
     my ($self) = @_;
 
-    my $currentemployment = $self->get_attributes('currentEmployment') || '';
+    my $currentempl = $self->get_attributes('currentEmployment') || '';
 
     $self->base->log(
         LA_DEBUG,
         "Applying Employement %s to user %s",
-        $currentemployment ? $currentemployment->id : '(none)',
+        $currentempl || '(none)',
         $self->id
     );
 
-    if (!$currentemployment) {
-        return $self->_resetEmployment;
-    }
-
-    $self->computeEmploymentDate;
-
-    my %attrsets = (
-        appliedEmployement => $currentemployment->id,
-    );
-    foreach my $attr (_reported_atributes(), qw(department managerContact)) {
-        my $uval = $self->get_attributes($attr) || '';
-        my $cval = $currentemployment->get_attributes($attr) || '';
-
-        for ($attr) {
-            if ($attr eq 'managerContact') {
-                if (!$cval) {
-                    my $dpmt  = $currentemployment->get_attributes('department') or last;
-                    my $odmpt = $currentemployment->base->get_object('group', $dpmt) or last;
-                    $cval = $odmpt->get_attributes('managedBy');
+    if (my $currentemployment = $self->base->get_object('employment', $currentempl)) {
+        $self->computeEmploymentDate;
+
+        my %attrsets = (
+            appliedEmployement => $currentemployment->id,
+        );
+        foreach my $attr (_reported_atributes(), qw(department managerContact)) {
+            my $uval = $self->get_attributes($attr) || '';
+            my $cval = $currentemployment->get_attributes($attr) || '';
+
+            for ($attr) {
+                if ($attr eq 'managerContact') {
+                    if (!$cval) {
+                        my $dpmt  = $currentemployment->get_attributes('department') or last;
+                        my $odmpt = $currentemployment->base->get_object('group', $dpmt) or last;
+                        $cval = $odmpt->get_attributes('managedBy');
+                    }
                 }
             }
-        }
-
-        if ($uval ne $cval) {
-            my $oattr = $currentemployment->base->attribute('self', $attr);
-            $attrsets{$oattr->iname} = $cval;
-        }
-    }
-
-    if (keys %attrsets) {
-        if (my $res = $self->set_fields(%attrsets)) {
-            $self->ReportChange('Update', 'Attr %s updated to match Employment %s', join(', ', sort keys %attrsets), $currentemployment->id);
-            return $res;
+
+            if ($uval ne $cval) {
+                my $oattr = $currentemployment->base->attribute('self', $attr);
+                $attrsets{$oattr->iname} = $cval;
+            }
+        }
+
+        if (keys %attrsets) {
+            if (my $res = $self->set_fields(%attrsets)) {
+                $self->ReportChange('Update', 'Attr %s updated to match Employment %s', join(', ', sort keys %attrsets), $currentemployment->id);
+                return $res;
+            }
+        } else {
+            return 1;
         }
     } else {
-        return 1;
-    }
+        return $self->_resetEmployment;
+    }
+
 }
 
@@ -1599 +1600 @@
         }
     }
-    if ($self->set_fields(%changes)) {
+    if (!%changes) {
+        return 1
+    } elsif ($self->set_fields(%changes)) {
         $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));