Changeset 2074

Timestamp:

08/26/17 15:33:59 (7 years ago)

Author:

nanardon

Message:

All reset department at unumployment

Location:

trunk

Files:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Ajax.pm (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (3 diffs)

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

@@ -128 +128 @@
     $c->stash->{random_password} =
     LATMOS::Accounts::Utils::genpassword(
-        %{ $c->req->params() }
+        %{ $c->req->params() },
+        checkpassword => sub {
+            $self->model('Accounts')->base->check_password(@_)
+        },
     );
 }

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

@@ -1581 +1581 @@
             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 ($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');
                 }
             }
@@ -1625 +1623 @@
     );
 
-    my @attributesToReset = _reported_atributes;
-    if (!$self->_get_attributes('_startEmployment')) {
-        push(@attributesToReset, qw(department));
-    }
+    my @attributesToReset = (_reported_atributes, qw(department));
 
     foreach my $attr (@attributesToReset) {
         my $default = $self->base->config("unemployment.$attr") || '';
         my $old = $self->_get_attributes($attr) || '';
+        warn "$attr $old $default";
         if ($old ne $default) {
             $changes{$attr} = $default || undef;
@@ -1643 +1639 @@
             $changes{'manager'} = $onext->_get_attributes('managerContact');
         }
-
     }