Changeset 1647 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Timestamp:

01/21/16 02:33:44 (8 years ago)

Author:

nanardon

Message:

Fix expiration computation, don't return negative duration

Location:

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

Files:

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

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

@@ -100 +100 @@
                 }
                 my $firstday = $self->object->get_attributes('firstday');
+
+                return if ($firstday gt $lastday);
 
                 my @fd = split('-', $firstday) or return;

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

@@ -1425 +1425 @@
     $expireOn ||= 'endEmployment';
 
+    # We check if matching start exists to know if using end* for expiration is
+    # safe, even undef
+    my %end2start = (
+        endEmployment        => 'startEmployment',
+        endStrictEmployment  => 'startStrictEmployment',
+        endCurrentEmployment => 'startCurrentEmployment',
+        endLastEmployment    => 'startFirstEmployment',
+    );
+
     if ($expireOn ne 'never') {
-        my $endemploy = $self->_get_attributes("_$expireOn") ||
-            (($self->base->config('unemployed_expire') ||'') eq 'no'
+        my $endemploy = $self->_get_attributes("_$end2start{$expireOn}")
+            ? $self->_get_attributes("_$expireOn")
+            : (($self->base->config('unemployed_expire') ||'') eq 'no'
                 ? undef
                 : $self->_get_attributes('create'));