Changeset 1365

Timestamp:

07/06/15 18:32:45 (9 years ago)

Author:

nanardon

Message:

Exchange manager and managerContact attribute to propagate manager to other bases

Location:

trunk

Files:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web.pm (modified) (1 diff)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm (modified) (1 diff)
• LATMOS-Accounts/bin/la-sql-find-expired (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/OCHelper/Accreq.pm (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (3 diffs)
• LATMOS-Accounts/lib/LATMOS/Accounts/Maintenance.pm (modified) (3 diffs)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web.pm

@@ -213 +213 @@
         },
         'managerContact' => {
-            'label' => 'Contact'
+            'label' => 'Resp. direct'
         },
         'site' => {

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm

@@ -40 +40 @@
             company
             department
+            managerContact
             manager
-            managerContact
             contratType
             expire

trunk/LATMOS-Accounts/bin/la-sql-find-expired

@@ -45 +45 @@
     printf("%s - %s (%s%s)\n", $obj->id, $obj->get_attributes('displayName'),
         $obj->get_attributes('expireText'),
-        ($obj->get_attributes('managerContact') ? ' ' .
-            $obj->get_attributes('managerContact') : ''),
+        ($obj->get_attributes('manager') ? ' ' .
+            $obj->get_attributes('manager') : ''),
     );
 }

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

@@ -21 +21 @@
         $info->{step} = 1;
         $info->{ask} = [
-            qw(givenName sn manager department)
+            qw(givenName sn managerContact department)
         ];
 

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

@@ -393 +393 @@
             },
             manager => {
-                delayed => 1,
-                can_values => sub {
-                    my %uniq = map { $_ => 1 } grep { $_ }
-                    ($_[1] ? $_[1]->get_attributes('manager') : ()),
-                    $base->search_objects('user', 'active=*');
-                    sort keys %uniq;
-                },
                 reference => 'user',
-                monitored => 1,
+                ro => 1,
+                get => sub {
+                    my ($self) = @_;
+                    if (my $manager = $self->object->_get_c_field('managerContact')) {
+                        return $manager;
+                    } elsif (my $department = $self->object->_get_c_field('department')) {
+                        my $obj = $self->base->get_object('group', $department);
+                        return $obj->_get_c_field('managedBy');
+                    } else {
+                        return;
+                    }
+                },
             },
             department => {
@@ -639 +643 @@
                     my $sth = $obj->db->prepare_cached(
                         q{
-                        select name from "user" join
-                        user_attributes on user_attributes.okey = "user".ikey
-                        where value = ? and attr = ?
-                        }
+                        SELECT
+                        "user".name FROM
+                        public."user",
+                        public.user_attributes_groups,
+                        public.group_attributes_users,
+                        public.group_attributes_base gb,
+                        public."group"
+                        WHERE
+                        "user".ikey = user_attributes_groups.okey AND
+                        user_attributes_groups.value = "group".name AND
+                        group_attributes_users.okey = gb.okey AND
+                        "group".ikey = group_attributes_users.okey AND
+                        gb.attr = 'sutype' AND
+                        gb.value = 'dpmt' AND
+                        group_attributes_users.attr = 'managedBy' AND
+                        group_attributes_users.value = ?
+                        } . ($self->base->{wexported} ? '' : ' and "user".exported = true') . q{
+                            and "user".ikey not in
+                        (select okey from user_attributes_users
+                        where attr = 'manager' and value != ? )
+                        union
+                        select "user".name FROM public."user",
+                        user_attributes_users where
+                        user_attributes_users.attr = 'manager' and user_attributes_users.value = ?
+                            and "user".ikey = user_attributes_users.okey
+                        } . ($self->base->{wexported} ? '' : ' and "user".exported = true')
                     );
-                    $sth->execute($obj->id, 'manager');
+                    $sth->execute($obj->id, $obj->id, $obj->id);
                     my @res;
                     while (my $res = $sth->fetchrow_hashref) {
@@ -706 +732 @@
             },
             managerContact => {
-                ro => 1,
+                delayed => 1,
+                can_values => sub {
+                    my %uniq = map { $_ => 1 } grep { $_ }
+                    ($_[1] ? $_[1]->get_attributes('managerContact') : ()),
+                    $base->search_objects('user', 'active=*');
+                    sort keys %uniq;
+                },
                 reference => 'user',
-                get => sub {
-                    my ($self) = @_;
-                    if (my $manager = $self->object->_get_c_field('manager')) {
-                        return $manager;
-                    } elsif (my $department = $self->object->_get_c_field('department')) {
-                        my $obj = $self->base->get_object('group', $department);
-                        return $obj->_get_c_field('managedBy');
-                    } else {
-                        return;
-                    }
-                },
+                monitored => 1,
+                iname => 'manager',
             },
             expireText => {

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Maintenance.pm

@@ -100 +100 @@
             'X-LATMOS-Reason' => 'Account expiration',
         );
-        my ($manager, $mail) = ($user->{obj}->get_c_field('managerContact'),
+        my ($manager, $mail) = ($user->{obj}->get_c_field('manager'),
             $user->{obj}->get_c_field('mail'));
         my $managermail = $manager ? $user->{obj}->base->
@@ -124 +124 @@
         my $mailcc = join(', ', @cc) || '';
         push(@summary, sprintf("%s : %s : %s\n",
-                $user->{obj}->queryformat('%{sn} %{givenName} : %{name} : %{department} : %{managerContact} : %{expireText}'),
+                $user->{obj}->queryformat('%{sn} %{givenName} : %{name} : %{department} : %{manager} : %{expireText}'),
                 $to || 'Not sent, no destination',
                 ($mailcc ? $mailcc : ''),
@@ -209 +209 @@
         my $uobj = $self->_base->get_object('user', $user);
         $uobj->get_attributes('unexported') and next; # can't happend
-        my $manager = $uobj->get_attributes('managerContact') || 'N/A';
+        my $manager = $uobj->get_attributes('manager') || 'N/A';
         push(@{$managers{$manager}{users}}, $uobj);