Changeset 385

Timestamp:

08/25/09 17:43:22 (15 years ago)

Author:

nanardon

Message:

• fix address fields management

File:

• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (4 diffs)

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

@@ -48 +48 @@
     return qw(memberOf manager directReports);
 }
+
+sub _office_address_fields { qw(telephoneNumber physicalDeliveryOfficeName) }
 
 sub _inline_fields {
@@ -78 +80 @@
         forward => 'forward',
         revaliases => 'revaliases',
+        map { $_ => $_ } $self->_address_fields,
+        map { $_ => $_ } $self->_office_address_fields,
         ) : ()),
     )
@@ -197 +201 @@
         $sth->finish;
         return $res->{name};
-    } elsif (grep { $field eq $_ } qw(telephoneNumber physicalDeliveryOfficeName)) {
+    } elsif (grep { $field eq $_ } $self->_office_address_fields) {
         if (my $fmainaddress = $self->get_c_field('mainaddress')) {
             my $address = $self->base->get_object('address', $fmainaddress);
@@ -296 +300 @@
             }
         };
-        grep { $attr eq $_ } (qw(telephoneNumber physicalDeliveryOfficeName), __PACKAGE__->_address_fields()) and do {
+        grep { $attr eq $_ } (__PACKAGE__->_office_address_fields, __PACKAGE__->_address_fields()) and do {
             if (my $fmainaddress = $self->get_c_field('mainaddress')) {
                 my $address = $self->base->get_object('address', $fmainaddress);