Changeset 745 for LATMOS-Accounts/lib

Timestamp:

01/25/10 13:50:53 (14 years ago)

Author:

nanardon

Message:

• don't discretelly create mainaddress when trying to set address related attributes to empty value and main address does not exists yet

File:

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

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

@@ -404 +404 @@
         grep { $attr eq $_ } (__PACKAGE__->_office_address_fields, __PACKAGE__->_address_fields()) and do {
             my $fmainaddress = $self->_get_c_field('mainaddress');
-            if (!$fmainaddress) {
+            # set address attribute => create address object on the fly
+            # except if attr is empty !
+            if (!$fmainaddress && $data{$attr}) {
                 $fmainaddress = $self->id . '-' . join('', map { ('a'..'z')[rand(26)] }
                 (0..4));
@@ -416 +418 @@
                 };
             }
-            if (my $address = $self->base->get_object('address', $fmainaddress)) {
+            if ($fmainaddress && 
+                (my $address = $self->base->get_object('address', $fmainaddress))) {
                 $res += $address->set_c_fields($attr => $data{$attr}) ||0;
             }