Changeset 1385 for trunk

Timestamp:

08/17/15 17:37:32 (9 years ago)

Author:

nanardon

Message:

Remove user/aliases reference to alias object
Fix mapping value when calling attribute formating

Location:

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

Files:

• Aliases.pm (modified) (1 diff)
• User.pm (modified) (1 diff)
• objects.pm (modified) (3 diffs)

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

@@ -166 +166 @@
 }
 
+sub set_fields {
+    my ($self, %data) = @_;
+
+    if ($data{forward}) {
+        $data{forward} = ref $data{forward}
+            ? $data{forward}
+            : [ $data{forward} ];
+    }
+
+    $self->SUPER::set_fields(%data);
+}
+
 
 1;

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

@@ -302 +302 @@
             },
             aliases   => {
-                reference => 'aliases',
+                #reference => 'aliases',
                 formtype => 'TEXT',
                 multiple => 1,

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

@@ -194 +194 @@
         $_ =~ /^exported$/ and $data{$_} = $data{$_} ? 1 : 0;
         my $formatted = ref($data{$_})
-            ? map { $attr->input($_) } @{ $data{$_} }
+            ? [ map { $attr->input($_) } @{ $data{$_} } ]
             : $attr->input($data{$_});
-        if ($attr->{inline}) {
+        if ($attr->{inline} && ! $attr->{delayed}) {
             $first{$_} = $formatted;
         } else {
@@ -203 +203 @@
     }
     $first{$class->_key_field} = $id;
+
+    my $lastid;
+    {
+        my $sthnextval = $base->db->prepare_cached("select nextval('ikey_seq') as c");
+        $sthnextval->execute;
+        $lastid = $sthnextval->fetchrow_hashref()->{c};
+        $first{ikey} = $lastid;
+    }
 
     my $sth = $base->db->prepare(
@@ -214 +222 @@
     $sth->execute(map { $first{$_} || undef } sort keys %first) or return;
 
-    my $lastid = $base->db->last_insert_id(undef, undef, $class->_object_table, undef);
     my $sthid = $base->db->prepare_cached(
         sprintf(q{select %s as k from %s where ikey = ?},