Changeset 1420

Timestamp:

10/14/15 20:21:41 (9 years ago)

Author:

nanardon

Message:

Fix attribute setting at object creation

Location:

trunk

Files:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Create.pm (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Nethost.pm (modified) (6 diffs)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Create.pm

@@ -45 +45 @@
     foreach my $attr (@{$info->{ask} || []}) {
         my $field = $form->field($attr);
-        my @vals = $c->req->param($field->attr_field_name());
-        $info->{contents}{$attr} = @vals > 1 ? \@vals : $vals[0];
+        my @vals = grep { $_ } $c->req->param($field->attr_field_name());
+        $info->{contents}{$attr} = @vals > 1 ? \@vals : $vals[0]
+            if (@vals);
     }
     my $ochelper = $base->ochelper($otype);

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

@@ -37 +37 @@
                 uniq => 1,
                 input => sub {
-                    my $ip = $_[0];
+                    my $ip = $_[0] or return;
                     $ip =~ s/(\D|^)0+/$1/g;
                     $ip =~ s:/.*$::;
@@ -44 +44 @@
                 checkinputformat => sub {
                     my ($value) = @_;
+                    $value or return;
                     my $ip = Net::IP->new($value);
                     $ip or return;
@@ -56 +57 @@
                 multiple => 1, 
                 managed => 1,
+                delayed => 1,
                 can_values => sub {
                     $base->search_objects('netzone', 'type=dhcp')
@@ -61 +63 @@
                 set => sub {
                     my ($self, $data) = @_;
+                    my $count = 0;
                     foreach (ref $data ? @{$data} : $data) {
                         my $zone = $self->base->get_object('netzone', $_)
@@ -69 +72 @@
                         $self->base->log(LA_NOTICE, "Assigning ip %s to host %s",
                             $freeips[$idx], $self->object->id);
-                    }
+                        $count++;
+                    }
+                    return $count;
                 },
             },
@@ -77 +82 @@
                 uniq => 1,
                 input => sub {
+                    $_[0] or return;
                     my @elem = split(/[:-]/, $_[0]);
                     return join(':', map { sprintf("%02x", hex($_)) } @elem);
                 },
                 checkinputformat => sub {
+                    $_[0] or return;
                     return $_[0] =~ /^([0-9a-f]{2}([:-]|$)){6}$/i ? 1 : undef;
                 },