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

Timestamp:

03/29/16 17:37:22 (8 years ago)

Author:

nanardon

Message:

Add task modules

Add two task module:

• Unexportexpired: unexported expire aliases and nethost
• Updatedyndata: refresh aliases and group with autoMember settings

Location:

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

Files:

• Sql.pm (modified) (3 diffs)
• Sql/Group.pm (modified) (3 diffs)
• Sql/Nethost.pm (modified) (1 diff)

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

@@ -131 +131 @@
     my @groups = $self->search_objects('group', 'autoMemberFilter=*');
 
+    my $res = 0;
     foreach (@groups) {
         my $g = $self->get_object('group', $_) or next;
-        $g->populate_dyn_group;
-    }
+        $res += $g->populate_dyn_group;
+    }
+
+    $self->log(LA_DEBUG, "Group Dyn res %d", $res);
+    $res
 }
 
@@ -142 +146 @@
     my @groups = $self->search_objects('aliases', 'autoMemberFilter=*');
 
+    my $res = 0;
     foreach (@groups) {
         my $g = $self->get_object('aliases', $_) or next;
-        $g->populate_dyn_aliases;
-    }
+        $res += $g->populate_dyn_aliases;
+    }
+
+    $self->log(LA_DEBUG, "Aliases Dyn res %d", $res);
+    $res
+}
+
+sub PopulateDynData {
+    my ($self) = @_;
+
+    foreach (1 .. 5) {
+        $self->log(LA_DEBUG, "%d loop for PopulateDynData", $_);
+        my $res = 0;
+        $res += $self->_sync_dyn_group   || 0;
+        $res += $self->_sync_dyn_aliases || 0;
+
+        if ($res == 0) {
+            last;
+        }
+    }
+
+    return 1;
 }
 
@@ -151 +176 @@
     my ($self) = @_;
 
-    for (qw(0 1)) { # Run twice for cross references
-        $self->_sync_dyn_group;
-        $self->_sync_dyn_aliases;
-    }
+    $self->PopulateDynData;
 
     if ($ENV{LA_NO_COMMIT}) {

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

@@ -180 +180 @@
                 q{insert into group_attributes_users (value, attr, okey) values (?,?,?)}
             );
-            $sth->execute($_, 'memberUID', $self->_get_ikey);
-            $res++;
+            $res += $sth->execute($_, 'memberUID', $self->_get_ikey);
         } elsif ($member{$_}{c}) {
             if (($user->get_c_field('department') || '') eq $self->id) {
@@ -192 +191 @@
                 q{delete from group_attributes_users where value = ? and attr = ? and okey = ?}
             );
-            $sth->execute($_, 'memberUID', $self->_get_ikey);
-            $res++;
+            $res += $sth->execute($_, 'memberUID', $self->_get_ikey);
         } # else {} # can't happend
     }
@@ -216 +214 @@
     );
     my $filter = $self->get_field('autoMemberFilter');
-    $self->_set_group_members(
+    my $res = $self->_set_group_members(
         [ $self->base->search_objects(
             'user',
             ref $filter ? @{ $filter } : $filter
         ) ]
-    )
+    );
+    $res;
 }
 

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

@@ -33 +33 @@
             date    => { ro => 1, inline => 1, },
             create  => { ro => 1, inline => 1, },
+            expire    => {
+                inline => 1,
+                formtype => 'DATE',
+                label => l('Expire'),
+            },
             ip      => {
                 monitored => 1,