Changeset 1844 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Timestamp:

10/20/16 12:48:39 (8 years ago)

Author:

nanardon

Message:

Fix aliases update from user 'forward'

This fix include:

• management of data passed as an array or not
• the comment and description update for automatic aliases

Location:

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

Files:

• Aliases.pm (modified) (1 diff)
• User.pm (modified) (1 diff)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Aliases.pm

@@ -74 +74 @@
                 set => sub {
                     my ($self, $data) = @_;
-                    my $sql = $data
-                        ? '{' . join(',', map { $_ =~ s/\\/\\\\/g; '"' .$_.'"' } @$data) . '}'
+                    my @datas = $data
+                        ? (ref $data
+                            ? @$data
+                            : ($data))
+                        : ();
+                    my $sql = @datas
+                        ? '{' . join(',', map { $_ =~ s/\\/\\\\/g; '"' .$_.'"' } @datas) . '}'
                         : undef;
                     $base->db->do(

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

@@ -568 +568 @@
                     if ($data) {
                         if (my $f = $self->base->get_object('aliases', $self->object->id)) {
-                            return $f->_set_c_fields(forward => $data);
+                            return $f->_set_c_fields(
+                                forward => $data,
+                                comment => undef,
+                                description => 'Forward for user ' . $self->object->id,
+                            );
                         } else {
                             if ($self->base->_create_c_object(