[Jifty-commit] r7166 - in jifty/trunk/lib/Jifty/Web/Form: Field

[Jifty commits]

Author: sartak
Date: Tue Jun  2 16:36:06 2009
New Revision: 7166

Modified:
   jifty/trunk/lib/Jifty/Web/Form/Field.pm
   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:
Factor out available_values into a method

Modified: jifty/trunk/lib/Jifty/Web/Form/Field.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Form/Field.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/Form/Field.pm	Tue Jun  2 16:36:06 2009
@@ -771,6 +771,16 @@
     return '';
 }
 
+=head2 available_values
+
+Returns the available values for this field.
+
+=cut
+
+sub available_values {
+    my $self = shift;
+    return @{ $self->action->available_values($self->name) };
+}
 
 =for private
 

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	Tue Jun  2 16:36:06 2009
@@ -18,7 +18,7 @@
 sub render_widget {
     my $self  = shift;
 
-    for my $opt (@{ $self->action->available_values($self->name) }) {
+    for my $opt ($self->available_values) {
         $self->render_option($opt);
     }
 }

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	Tue Jun  2 16:36:06 2009
@@ -45,7 +45,7 @@
 EOF
 
 
-    for my $opt (@{ $self->action->available_values($self->name) }) {
+    for my $opt ($self->available_values) {
         my $display = $opt->{'display'};
         my $value   = $opt->{'value'} ||'' ;
         # TODO XXX FIXME worry about escape value, display?

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	Tue Jun  2 16:36:06 2009
@@ -20,7 +20,7 @@
 sub render_widget {
     my $self  = shift;
 
-    for my $opt (@{ $self->action->available_values($self->name) }) {
+    for my $opt ($self->available_values) {
         $self->render_option($opt);
     }
 }

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	Tue Jun  2 16:36:06 2009
@@ -28,7 +28,7 @@
     $field .= q! multiple="multiple"! if $self->multiple;
     $field .= qq!      >\n!;
     my $current_value = $self->current_value;
-    for my $opt (@{ $self->action->available_values($self->name) }) {
+    for my $opt ($self->available_values) {
         my $display = $opt->{'display'};
         my $value   = $opt->{'value'};
         $value = "" unless defined $value;
@@ -63,8 +63,7 @@
     $field .= qq! class="@{[ $self->classes ]}"> !;
     my $value = $self->current_value;
     if(defined $value) {
-        my @value = grep { $_->{value} eq $value }
-                        @{ $self->action->available_values($self->name) };
+        my @value = grep { $_->{value} eq $value } $self->available_values;
         $value = $value[0]->{display} if scalar @value;
     }
     $field .= Jifty->web->escape(_($value)) if defined $value;