Changeset 464

Timestamp:

10/03/09 03:25:03 (15 years ago)

Author:

nanardon

Message:

• department field is now used to manage the real department of the user (if any), and the user can be in other department groups. At time setting departement push user into group, but it can be removed from the group, this is done on database side, I am not sure if this is not finally a feature...

Files:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (2 diffs)

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

@@ -32 +32 @@
     postalCode => [ 'Code postal' ],
     postOfficeBox => [ 'BP' ],
-    department => [ 'Département' ],
+    department => [ 'Département', 'select-N:group' ],
     streetAddress => [ 'Rue', 'textarea' ],
     title => [ 'Fonction' ],

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

@@ -78 +78 @@
         directReports => 'directReports',
         managedObjects => 'managedObjects',
-        department => 'department',
         otheraddress => 'otheraddress',
         mainaddress => 'mainaddress',
@@ -137 +136 @@
         }
         return \@res;
-    } elsif ($field eq 'department') {
-        my $sth = $self->db->prepare_cached(
-            q{
-            select name from "group" join
-            group_attributes on "group".ikey = group_attributes.okey
-            where okey in (select okey from group_attributes_users where value = ?)
-            and attr = ? and value = ?
-            }
-        );
-        $sth->execute($self->id, 'sutype', 'dpmt');
-        my @res;
-        while (my $res = $sth->fetchrow_hashref) {
-            push(@res, $res->{name});
-        }
-        return join(',', @res);
     } elsif ($field eq 'managedObjects') {
         my $sth = $self->db->prepare_cached(