Changeset 347 for LATMOS-Accounts/lib/LATMOS

Timestamp:

08/15/09 03:34:34 (15 years ago)

Author:

nanardon

Message:

• don't use anymore address attributes on user object itself: o user has one or several address containing this info o address can have a 'site' attribute making global address fetch from site object o one and only one of this address can be set as main (attribute isMainAddress, setting it delete it from other object for this user)

o in case no main address is found and user has a 'site' attribute, global address is fetch from it
o user have now an attribute 'mainaddress' to get the name of the address object for main address

File:

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

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

@@ -74 +74 @@
         department => 'department',
         otheraddress => 'otheraddress',
+        mainaddress => 'mainaddress',
         ) : ()),
     )
@@ -184 +185 @@
         }
         return \@values;
-    } elsif ((grep { $field eq $_ } __PACKAGE__->_address_fields())
-        && (my $fsite = $self->get_c_field('site'))) {
-        my $site = $self->base->get_object('site', $fsite);
-        if ($site) {
-            return $site->get_c_field($field);
+    } elsif ($field eq 'mainaddress') {
+        my $sth = $self->db->prepare_cached(q{
+            select name from address join address_attributes on ikey = okey
+            where "user" = ? and attr = 'isMainAddress'
+            });
+        $sth->execute($self->id);
+        my $res = $sth->fetchrow_hashref;
+        $sth->finish;
+        return $res->{name};
+    } elsif (grep { $field eq $_ } qw(telephoneNumber physicalDeliveryOfficeName)) {
+        if (my $fmainaddress = $self->get_c_field('mainaddress')) {
+            my $address = $self->base->get_object('address', $fmainaddress);
+            if ($address) {
+                return $address->get_c_field($field);
+            } else { # can't happend
+                return;
+            }
+        } else {
+            return $self->SUPER::get_field($field);
+        }
+    } elsif (grep { $field eq $_ } __PACKAGE__->_address_fields()) {
+        if (my $fmainaddress = $self->get_c_field('mainaddress')) {
+            my $address = $self->base->get_object('address', $fmainaddress);
+            if ($address) {
+                return $address->get_c_field($field);
+            } else { # can't happend
+                return;
+            }
+        } elsif (my $fsite = $self->get_c_field('site')) {
+            my $site = $self->base->get_object('site', $fsite);
+            if ($site) {
+                return $site->get_c_field($field);
+            } else { # can't happend
+                return;
+            }
+        } else {
+            return;
         }
     } else {