[Jifty-commit] r2270 - jifty/trunk/lib/Jifty/Action/Record

[jifty-commit at lists.jifty.org]

Author: audreyt
Date: Sat Dec  2 23:06:45 2006
New Revision: 2270

Modified:
   jifty/trunk/lib/Jifty/Action/Record/Search.pm

Log:
* Add an "(any)" label to Action::Record::Search when render as radio.

Modified: jifty/trunk/lib/Jifty/Action/Record/Search.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Action/Record/Search.pm	(original)
+++ jifty/trunk/lib/Jifty/Action/Record/Search.pm	Sat Dec  2 23:06:45 2006
@@ -64,8 +64,18 @@
 
         if($info->{valid_values}) {
             my $valid_values = $info->{valid_values};
-            $valid_values = [$valid_values] unless ref($valid_values) eq 'ARRAY';
-            unshift @$valid_values, "";
+
+            local $@;
+            $info->{valid_values} = $valid_values = (eval { [ @$valid_values ] } || [$valid_values]);
+
+            # For radio display, display an "any" label as empty choices looks weird
+            if (lc $info->{render_as} eq 'radio') {
+                unshift @$valid_values, { display => _("(any)"), value => '' };
+                $info->{default_value} ||= '';
+            }
+            else {
+                unshift @$valid_values, "";
+            }
         }
 
         if(lc $info->{'render_as'} eq 'password') {