Changeset 386 for LATMOS-Accounts

Timestamp:

08/25/09 19:11:24 (15 years ago)

Author:

nanardon

Message:

• address attributes now update main address attributes

Location:

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql

Files:

• Address.pm (modified) (1 diff)
• User.pm (modified) (9 diffs)

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

@@ -85 +85 @@
                 }
             }
+            $fdata{$attr} = $data{$attr} || undef;
+            next;
         };
         $fdata{$attr} = $data{$attr} || undef;

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

@@ -49 +49 @@
 }
 
-sub _office_address_fields { qw(telephoneNumber physicalDeliveryOfficeName) }
+sub _office_address_fields { qw(telephoneNumber physicalDeliveryOfficeName site) }
 
 sub _inline_fields {
@@ -64 +64 @@
     return (
         memberOf        => 'memberOf',
+        map { $_ => $_ } $self->_address_fields,
+        map { $_ => $_ } $self->_office_address_fields,
         (($for !~ /w/) ? (
         uid => 'name',
@@ -80 +82 @@
         forward => 'forward',
         revaliases => 'revaliases',
-        map { $_ => $_ } $self->_address_fields,
-        map { $_ => $_ } $self->_office_address_fields,
         ) : ()),
     )
@@ -201 +201 @@
         $sth->finish;
         return $res->{name};
-    } elsif (grep { $field eq $_ } $self->_office_address_fields) {
+    } elsif (grep { $field eq $_ } __PACKAGE__->_address_fields(), $self->_office_address_fields) {
         if (my $fmainaddress = $self->get_c_field('mainaddress')) {
             my $address = $self->base->get_object('address', $fmainaddress);
@@ -212 +212 @@
             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;
-        }
     } elsif ($field eq 'aliases') {
         my $sth = $self->db->prepare(q{
@@ -264 +246 @@
     my ($self, %data) = @_;
     my %fdata;
+    my $res = 0;
     foreach my $attr (keys %data) {
         $attr =~ /^memberOf$/ and do {
@@ -282 +265 @@
                     );
                     $sth->execute($self->id, 'memberUID', $group->_get_ikey);
+                    $res++;
                 } elsif ($member{$_}{c}) {
                     my $sth = $self->db->prepare_cached(
@@ -287 +271 @@
                     );
                     $sth->execute($self->id, 'memberUID', $group->_get_ikey);
+                    $res++;
                 } # else {} # can't happend
             }
             next;
         };
-        $attr =~ /^site$/ and do {
-            my $site = $self->base->get_object('site', $data{$attr});
-            if ($site) {
-                foreach (__PACKAGE__->_address_fields()) {
-                    $fdata{$_} = undef;
-                    $data{$_} = undef;
-                }
-            }
-        };
         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);
-                if ($address) {
-                    $address->set_fields($attr => $data{$attr});
-                }
+            my $fmainaddress = $self->get_c_field('mainaddress');
+            if (!$fmainaddress) {
+                $fmainaddress = '$self->id' . '-' . map { ('a'..'z')[rand(26)] }
+                (0..4);
+                $self->base->create_c_object(
+                    'address', $fmainaddress,
+                    isMainAddress => 1 ) or return;
+            }
+            if (my $address = $self->base->get_object('address', $fmainaddress)) {
+                $res += $address->set_c_fields($attr => $data{$attr});
             }
             next;
@@ -312 +293 @@
     }
     if (keys %fdata) {
-        $self->SUPER::set_fields(%fdata);
-    } else { return 0; }
+        return $self->SUPER::set_fields(%fdata) + $res;
+    } else { return $res; }
 }