Changeset 1506

Timestamp:

12/18/15 18:35:42 (9 years ago)

Author:

nanardon

Message:

Set user's attribute read-only when employment is used

Location:

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

Files:

• Employment.pm (modified) (2 diffs)
• User.pm (modified) (6 diffs)

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

@@ -142 +142 @@
 
     if ($expire != $nextexpire) {
-        $user->_set_c_fields(expire => $endemploy);
+        $user->set_fields(expire => $endemploy);
     }
 
@@ -158 +158 @@
 
         if ($uval ne $cval) {
-            $attrsets{$attr} = $cval;
+            my $oattr = $self->base->attribute('user', $attr);
+            $attrsets{$oattr->iname} = $cval;
         }
     }
 
     if (keys %attrsets) {
-        return $user->_set_c_fields(%attrsets);
+        return $user->set_fields(%attrsets);
     } else {
         return 1;

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

@@ -196 +196 @@
                 monitored => 1,
             },
-            expire        => { inline => 1, formtype => 'DATETIME', monitored => 1, },
-            endcircuit    => { inline => 1, formtype => 'DATE',     monitored => 1, },
+            expire        => {
+                ro => sub { !$_[0] and return 1; $_[0]->listEmployment ? 1 : 0 },
+                inline => 1,
+                formtype => 'DATETIME',
+                monitored => 1,
+            },
+            endcircuit    => {
+                ro => sub { !$_[0] and return 1; $_[0]->listEmployment ? 1 : 0 },
+                inline => 1,
+                formtype => 'DATE',
+                monitored => 1,
+            },
             endEmployment => {
                 formtype => 'DATETIME',
@@ -237 +247 @@
                         $listold->execute($self->id);
                         my $res = $listold->fetchrow_hashref;
-                        $listold->finish;
-                        if ($res) {
+                        if ($res && $res->{lastday}) {
                             $end = DateTime->from_epoch(epoch => str2time($res->{lastday}));
                             $end->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
                             $end->add(hours => 23, minutes => 59, seconds => 59);
                         }
+                        $listold->finish;
                     }
                     return $end ? $end->iso8601 : undef
@@ -473 +483 @@
             },
             department => {
+                ro => sub { !$_[0] and return 1; $_[0]->listEmployment ? 1 : 0 },
                 reference => 'group',
                 can_values => sub {
@@ -480 +491 @@
             },
             contratType => {
+                ro => sub { !$_[0] and return 1; $_[0]->listEmployment ? 1 : 0 },
                 reference => 'group',
                 can_values => sub {
@@ -797 +809 @@
             },
             managerContact => {
+                ro => sub { !$_[0] and return 1; $_[0]->listEmployment ? 1 : 0 },
                 delayed => 1,
                 can_values => sub {
@@ -909 +922 @@
             encryptedPassword => { },
             description => { },
-            company => { },
+            company => {
+                ro => sub { !$_[0] and return 1; $_[0]->listEmployment ? 1 : 0 },
+            },
             comment => { },
             college => { },