Changeset 1836 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Timestamp:

09/01/16 16:59:26 (8 years ago)

Author:

nanardon

Message:

Fix expire date not reset when unlimited statut is set

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (1 diff)

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

@@ -1481 +1481 @@
     );
 
+    # TODO rework this working code but bloat
     if ($expireOn ne 'never') {
         my $endemploy = '';
         if ($self->_get_attributes("_$end2start{$expireOn}")) {
-            $endemploy = $self->_get_attributes("_$expireOn") || 'UNCHANGED';
+            $endemploy = $self->_get_attributes("_$expireOn") || '';
+            $endemploy ||= 'UNCHANGED' unless($currentemployment);
         } elsif (($self->base->config('unemployed_expire') ||'') eq 'no') {
             $endemploy = '';