Changeset 959 for LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm

Timestamp:

05/15/12 03:30:21 (12 years ago)

Author:

nanardon

Message:

• merge all work around forms

File:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm (modified) (7 diffs)

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm

@@ -216 +216 @@
 
 sub attr_label {
-    my ($self, $attr) = @_;
-    my ($hint, $label) = ('', '');
+    my ($self, $attr, $label, $hint) = @_;
+    $label ||= '';
+    $hint ||= '';
     LATMOS::Accounts::Web->config->{attrs} ||= {};
-    my $htmlname = ($self->{object} ? $self->{object}->id . '_' : '') . $attr;
+    my $attribute = $self->base->attribute($self->otype, $attr);
+    my $htmlname = $self->escape($self->attr_field_name($attr));
     if (my $attr_config = LATMOS::Accounts::Web->config->{attrs}{$attr}) {
-        $label = $attr_config->{label} || '';
+        $label ||= $attr_config->{label} || '';
         #utf8::is_utf8($label) && utf8::encode($label);
-        $hint = $attr_config->{hint} || '';
+        $hint ||= $attr_config->{hint} || '';
         #utf8::is_utf8($hint) && utf8::encode($hint);
     }
@@ -243 +245 @@
 
 sub attr_raw_value {
-    my ($self, $attr) = @_;
-    return $self->{c}->req->param($attr) ||
-        ($self->{object} ? $self->{object}->get_attributes($attr) : '')
+    my ($self, $attribute) = @_;
+    my @val = grep { $_ }  
+        ($self->{c}->req->param($attribute->name))
+        || ($self->{object}
+            ? ($self->{object}->get_attributes($attribute->name))
+            : ());
+
+    if (@val) {
+        return @val;
+    } else {
+        return (grep { $_ } ($attribute->default_value))
+    }
 }
 
@@ -251 +262 @@
     my ($self, $attr) = @_;
     my $id = $self->{object}
-        ? $self->{object}->id . '_'
+        ? ($self->{object}->id || '')
         : '';
+    $id .= '_' if ($id);
     $id =~ s/\./_/g;
     $id =~ s/-/_/g;
@@ -403 +415 @@
                 last;
             };
-
-            warn $_;
         }
     return '';
@@ -450 +460 @@
                     frequency => 1,
                     with => "'val='+element.value" .
-                    ($self->{object} ? "+'&exclude=" . $self->{object}->id . "'" :
-                        ''),
+                    ($self->{object} ?
+                        "+'&exclude=" . ($self->{object}->id || '') . "'" 
+                        : ''),
                 }
             )
@@ -463 +474 @@
     my ($self, $attr, $type) = @_;
 
-    my $attr_info = $type
-        ? { formtype => $type }
-        : undef;
-
-    my $attribute = ($self->{object}
-        ? $self->{object}->attribute($attr)
-        : $self->base->attribute($self->otype, $attr));
-
-    $attribute ||= $self->base->attribute(
-        $self->otype,
-        { 
-            name => $attr,
-            formtype => $type
-        },
-    );
+    my $attribute = ($type
+        ? ref $type
+            ? $self->base->attribute(
+                $self->otype,
+                { %$type, name => $attr },)
+            : $self->base->attribute(
+                $self->otype,
+                { formtype => $type , name => $attr },)
+        : ($self->{object}
+            ? $self->{object}->attribute($attr)
+            : $self->base->attribute($self->otype, $attr, { formtype => $type })))
+        || $self->base->attribute($self->otype, { name => $attr });
+
 
     my $htmlname = $self->escape($self->attr_field_name($attr));
 
     my @html_fields;
-    foreach my $attr_raw_value (
-        $attribute->multiple
-            ? (grep { $_ } $self->attr_raw_value($attr))
-            : $self->attr_raw_value($attr) || '') {
+
+    # Force Array context:
+    my @attr_raw_value = ();
+    if ($attribute->multiple) {
+        @attr_raw_value = grep { $_ } $self->attr_raw_value($attribute);
+    } else {
+        my ($val) = $self->attr_raw_value($attribute);
+        @attr_raw_value = ($val || '');
+    }
+
+    foreach my $attr_raw_value (@attr_raw_value) {
 
         my $html_id = $htmlname .
@@ -501 +517 @@
     }
 
-    if ($attribute->{multiple}) {
+    if ($attribute->{multiple} && !$attribute->readonly) {
         my $html_id = $htmlname . '_m_SUBID';