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

Timestamp:

01/22/10 14:48:55 (14 years ago)

Author:

nanardon

Message:

• when use a <select> when text attributes are config limited to a list of values

File:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm (modified) (1 diff)

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

@@ -294 +294 @@
         /^text(-\w+)?(?::(\d+))?/ and do {
             my $flag = $1 || '';
-            my $textf = sprintf(
-                '<input type="text" id="%s" name="%s" value="%s" size="%d">',
-                $self->escape($htmlname),
-                $self->escape($htmlname),
-                $self->escape($self->attr_raw_value($attr)),
-                $2 || 30,
-            );
-            if ($flag =~ /A/) {
-            $textf .= qq|<span id="${htmlname}_auto_complete"></span>|;
-            $textf .= "\n";
-            $textf .= $self->{c}->prototype->auto_complete_field(
-                $htmlname,
-                {
-                update => "${htmlname}_auto_complete",
-                url => $self->{c}->uri_for('/ajax', 'attrvalues', $self->otype, $attr),
-                indicator => "${htmlname}_stat", min_chars => 1,
-                with => "'val='+document.getElementById('$htmlname').value",
-                frequency => 2,
+            if (my @allowed = $self->base->obj_attr_allowed_values(
+                    $self->{otype}, $attr)) {
+                my $cvalue = $self->attr_raw_value($attr);
+                my $textf = sprintf('<select  id="%s" name="%s">',
+                    $self->escape($htmlname),
+                    $self->escape($htmlname)) . "\n";
+                $textf .= '<option value="">--</option>' . "\n";
+                foreach (sort @allowed) {
+                    $textf .= sprintf('<option value="%s"%s>%s</option>' . "\n",
+                        $self->escape($_),
+                        (($cvalue || '') eq $_ ? ' selected="selected"' : ''),
+                        $self->escape($_),
+                    );
                 }
-            );
+                $textf .= "</select>\n";
+                return $textf;
+            } else {
+                my $textf = sprintf(
+                    '<input type="text" id="%s" name="%s" value="%s" size="%d">',
+                    $self->escape($htmlname),
+                    $self->escape($htmlname),
+                    $self->escape($self->attr_raw_value($attr)),
+                    $2 || 30,
+                );
+                if ($flag =~ /A/) {
+                $textf .= qq|<span id="${htmlname}_auto_complete"></span>|;
+                $textf .= "\n";
+                $textf .= $self->{c}->prototype->auto_complete_field(
+                    $htmlname,
+                    {
+                    update => "${htmlname}_auto_complete",
+                    url => $self->{c}->uri_for('/ajax', 'attrvalues', $self->otype, $attr),
+                    indicator => "${htmlname}_stat", min_chars => 1,
+                    with => "'val='+document.getElementById('$htmlname').value",
+                    frequency => 2,
+                    }
+                );
+                }
+                if ($flag =~ /U/) {
+                $textf .= qq|<span id="${htmlname}_observer_uniq"></span>|;
+                $textf .= "\n";
+                $textf .= $self->{c}->prototype->observe_field(
+                    $htmlname,
+                    {
+                    update => "${htmlname}_observer_uniq",
+                    url => $self->{c}->uri_for('/ajax', 'objattrexist',
+                        $self->otype, $attr),
+                    frequency => 2,
+                    indicator => "${htmlname}_stat", min_chars => 1,
+                    with => "'val='+document.getElementById('$htmlname').value" .
+                        ($self->{object} ? "+'&exclude=" . $self->{object}->id . "'" :
+                            ''),
+                    }
+                );
+                }
+                $textf .= qq|<span style="display:none" id="${htmlname}_stat">Searching...</span>|;
+
+                return $textf;
             }
-            if ($flag =~ /U/) {
-            $textf .= qq|<span id="${htmlname}_observer_uniq"></span>|;
-            $textf .= "\n";
-            $textf .= $self->{c}->prototype->observe_field(
-                $htmlname,
-                {
-                update => "${htmlname}_observer_uniq",
-                url => $self->{c}->uri_for('/ajax', 'objattrexist',
-                    $self->otype, $attr),
-                frequency => 2,
-                indicator => "${htmlname}_stat", min_chars => 1,
-                with => "'val='+document.getElementById('$htmlname').value" .
-                    ($self->{object} ? "+'&exclude=" . $self->{object}->id . "'" :
-                        ''),
-                }
-            );
-            }
-            $textf .= qq|<span style="display:none" id="${htmlname}_stat">Searching...</span>|;
-
-            return $textf;
         };
     }