Changeset 341

Timestamp:

08/14/09 17:00:11 (15 years ago)

Author:

nanardon

Message:

• setting site attributes reset address attributes and make them return from the associated site object, eg people have address of their site

Location:

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

Files:

• Address.pm (modified) (1 diff)
• User.pm (modified) (2 diffs)
• objects.pm (modified) (1 diff)

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

@@ -58 +58 @@
 }
 
+sub get_field {
+    my ($self, $field) = @_;
+    if ((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);
+        }
+    } else {
+        return $self->SUPER::get_field($field);
+    }
+}
+
+sub set_fields {
+    my ($self, %data) = @_;
+    my %fdata;
+    foreach my $attr (keys %data) {
+        $attr =~ /^site$/ and do {
+            my $site =
+            $self->base->get_object('site',
+                $data{$attr});
+            if ($site) {
+                foreach (__PACKAGE__->_address_fields()) {
+                    $fdata{$_} = undef;
+                }
+            };
+            $fdata{$attr} = $data{$attr} || undef;
+        }
+    }
+    if  (keys %fdata) {
+        $self->SUPER::set_fields(%fdata);
+    }
+}
+
+
 1;
 

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

@@ -173 +173 @@
         $res->{expire} =~ /(\d+) days\s*(\w)?/;
         return $1 + ($2 ? 1 : 0);
+    } 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);
+        }
     } else {
         return $self->SUPER::get_field($field);
@@ -208 +214 @@
             next;
         };
+        $attr =~ /^site$/ and do {
+            my $site = $self->base->get_object('site', $data{$attr});
+            if ($site) {
+                foreach (__PACKAGE__->_address_fields()) {
+                    $fdata{$_} = undef;
+                }
+            }
+        };
         $fdata{$attr} = $data{$attr} || undef;
     }

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

@@ -23 +23 @@
 
 Account base access over standard unix file format.
+
+=cut
+
+# This fields are special in sense they may come from site field
+sub _address_fields { qw(l postalCode streetAddess postOfficeBox st) }
 
 =head1 FUNCTIONS