[Jifty-commit] r1929 - in jifty/trunk: lib/Jifty/Action/Record

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Sun Sep 3 00:19:12 EDT 2006


Author: nelhage
Date: Sun Sep  3 00:19:11 2006
New Revision: 1929

Modified:
   jifty/trunk/lib/Jifty/Action/Record/Search.pm
   jifty/trunk/share/web/templates/__jifty/admin/fragments/list/search

Log:
Some search fixes

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	Sun Sep  3 00:19:11 2006
@@ -67,11 +67,11 @@
             $valid_values = [$valid_values] unless ref($valid_values) eq 'ARRAY';
             unshift @$valid_values, "";
         }
-        
+
         if(lc $info->{'render_as'} eq 'password') {
             delete $args->{$field};
             next;
-        } 
+        }
 
         warn "No column for: $field" unless($column);
         
@@ -86,6 +86,7 @@
         next if($field =~ /^(.*)_id$/ && $self->record->column($1));
 
         if($column->type =~ /^(?:text|varchar)/i) {
+            $info->{render_as} = 'text';
             my $label = $info->{label} || $field;
             $args->{"${field}_contains"} = {%$info, label => "$label contains"};
             $args->{"${field}_lacks"} = {%$info, label => "$label lacks"};

Modified: jifty/trunk/share/web/templates/__jifty/admin/fragments/list/search
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/admin/fragments/list/search	(original)
+++ jifty/trunk/share/web/templates/__jifty/admin/fragments/list/search	Sun Sep  3 00:19:11 2006
@@ -5,13 +5,11 @@
 my $search = Jifty->web->new_action(
     class             => "Search".$object_type,
     moniker           => "search",
-    # XXX TODO This doesn't do what we want, because somehow we're not
-    # seeing the action in the request when we're rendered. I suspect
-    # weird fragment-ness.
     sticky_on_success => 1,
 );
 
 </%init>
+<div class="jifty_admin">
 % for my $arg ($search->argument_names) {
  <% $search->form_field($arg) %>
 % }
@@ -25,3 +23,4 @@
     }
   )
 %>
+</div>


More information about the Jifty-commit mailing list