[Jifty-commit] r7191 - jifty/trunk/lib/Jifty/Web/Form/Field

Jifty commits jifty-commit at lists.jifty.org
Thu Jun 4 20:22:21 EDT 2009


Author: sartak
Date: Thu Jun  4 20:22:21 2009
New Revision: 7191

Modified:
   jifty/trunk/lib/Jifty/Web/Form/Field/Collection.pm
   jifty/trunk/lib/Jifty/Web/Form/Field/Combobox.pm
   jifty/trunk/lib/Jifty/Web/Form/Field/Radio.pm
   jifty/trunk/lib/Jifty/Web/Form/Field/Select.pm

Log:
Support plain strings in available_values

Modified: jifty/trunk/lib/Jifty/Web/Form/Field/Collection.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Form/Field/Collection.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/Form/Field/Collection.pm	Thu Jun  4 20:22:21 2009
@@ -48,8 +48,9 @@
 sub render_option {
     my $self = shift;
     my $opt = shift;
-    my $display = $opt->{'display'};
-    my $value   = defined $opt->{'value'} ? $opt->{'value'} : "0";
+    my $display = ref($opt) ? $opt->{'display'} : $opt;
+    my $value   = ref($opt) ? $opt->{'value'} : $value;
+    $value = "0" if !defined($value);
 
     my $id = $self->element_id . "-" . $value;
     $id =~ s/\s+/_/;

Modified: jifty/trunk/lib/Jifty/Web/Form/Field/Combobox.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Form/Field/Combobox.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/Form/Field/Combobox.pm	Thu Jun  4 20:22:21 2009
@@ -46,8 +46,9 @@
 
 
     for my $opt ($self->available_values) {
-        my $display = $opt->{'display'};
-        my $value   = $opt->{'value'} ||'' ;
+        my $display = ref($opt) ? $opt->{'display'} : $opt;
+        my $value   = (ref($opt) ? $opt->{'value'} : $opt) || '';
+
         # TODO XXX FIXME worry about escape value, display?
         $field .= qq!<option value="$value"!;
         $field .= qq! selected="selected"!

Modified: jifty/trunk/lib/Jifty/Web/Form/Field/Radio.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Form/Field/Radio.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/Form/Field/Radio.pm	Thu Jun  4 20:22:21 2009
@@ -50,10 +50,10 @@
 sub render_option {
     my $self = shift;
     my $opt = shift;
-    my $display = $opt->{'display'};
-    my $value   = defined $opt->{'value'} ? $opt->{'value'} : '';
+    my $display = ref($opt) ? $opt->{'display'} : $opt;
+    my $value   = ref($opt) ? $opt->{'value'} : $opt;
+    $value = '' if !defined($value);
 
-    
     my $id = $self->element_id . "-" . $value;
     $id =~ s/\s+/_/;
     my $field = qq! <input type="radio" !;

Modified: jifty/trunk/lib/Jifty/Web/Form/Field/Select.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Form/Field/Select.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/Form/Field/Select.pm	Thu Jun  4 20:22:21 2009
@@ -29,8 +29,8 @@
     $field .= qq!      >\n!;
     my $current_value = $self->current_value;
     for my $opt ($self->available_values) {
-        my $display = $opt->{'display'};
-        my $value   = $opt->{'value'};
+        my $display = ref($opt) ? $opt->{'display'} : $opt;
+        my $value   = ref($opt) ? $opt->{'value'} : $opt;
         $value = "" unless defined $value;
         $field .= qq!<option value="@{[ Jifty->web->escape($value) ]}"!;
         $field .= qq! selected="selected"!


More information about the Jifty-commit mailing list