Changeset 1949

Timestamp:

02/14/17 20:07:23 (7 years ago)

Author:

nanardon

Message:

Ignore resetEmployment result

Location:

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

Files:

• Employment.pm (modified) (2 diffs)
• User.pm (modified) (1 diff)

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

@@ -317 +317 @@
     $user or return;
     my $res = $class->SUPER::_create($base, $id, %data);
-    $user->applyCurrentEmployment or return;
+    $user->applyCurrentEmployment;
     $res;
 }
@@ -332 +332 @@
     if ($res) {
         my $ouser = $base->get_object('user', $user);
-        $ouser->applyCurrentEmployment or return;
+        $ouser->applyCurrentEmployment;
     }
 

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

@@ -1600 +1600 @@
         }
     }
-    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));
+    if (%changes) {
+        if ($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));
+            return 1;
+        } else {
+            return 0;
+        }
+    } else {
         return 1;
     }
 
-    return 0;
 }