Changeset 1294 for branches/4.0/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm

Timestamp:

03/20/15 18:48:21 (9 years ago)

Author:

nanardon

Message:

Backport changes reporting

Location:

branches/4.0

Files:

• . (modified) (1 prop)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (2 diffs)

branches/4.0/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm

@@ -521 +521 @@
         };
         $attr =~ /^memberOf$/ and do {
-            my %member;
+            my %members;
             my $memberof = $self->get_field('memberOf');
             foreach (ref $memberof
                 ? @{ $memberof }
                 : $memberof || ()) {
-                $member{$_}{c} = 1;
+                $members{$_}{c} = 1;
             }
             foreach (grep { $_ } ref $data{$attr} ? @{ $data{$attr} || []} : $data{$attr}) {
-                $member{$_}{n} = 1;
-            }
-
-            foreach (keys %member) {
-                $member{$_}{c} && $member{$_}{n} and next; # no change !
-                my $group = $self->base->get_object('group', $_) or next;
+                $members{$_}{n} = 1;
+            }
+
+            foreach my $member (keys %members) {
+                $members{$member}{c} && $members{$member}{n} and next; # no change !
+                my $group = $self->base->get_object('group', $member) or do {
+                    la_log(LA_WARN, "Cannot get group %s to set members", $member); 
+                    next;
+                };
                 ($group->_get_c_field('sutype') || '') =~ /^(jobtype|contrattype)$/ and next;
-                if ($member{$_}{n}) {
-                    my $sth = $self->db->prepare_cached(
-                        q{insert into group_attributes_users (value, attr, okey) values (?,?,?)}
-                    );
-                    $sth->execute($self->id, 'memberUID', $group->_get_ikey);
-                    $res++;
-                } elsif ($member{$_}{c}) {
-                    if (($self->get_c_field('department') || '') eq $group->id) {
+                if ($members{$member}{n}) {
+                    my @newmembers = $group->get_attributes('memberUID');
+                    $res += $group->_set_c_fields('memberUID', [ $self->id, @newmembers ]);
+                } elsif ($members{$member}{c}) {
+                    if (($self->_get_c_field('department') || '') eq $group->id) {
                         $self->base->log(LA_WARN,
                             "Don't removing user %s from group %s: is it's department",
@@ -549 +549 @@
                         next;
                     }
-                    my $sth = $self->db->prepare_cached(
-                        q{delete from group_attributes_users where value = ? and attr = ? and okey = ?}
-                    );
-                    $sth->execute($self->id, 'memberUID', $group->_get_ikey);
-                    $res++;
+                    my @newmembers = grep { $_ ne $self->id } $group->get_attributes('memberUID');
+                    $res += $group->_set_c_fields('memberUID', [ @newmembers ]);
                 } # else {} # can't happend
             }