beef-admin_area 0.3.6 → 0.3.7

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/app/controllers/admin/users_controller.rb

@@ -5,20 +5,19 @@ class Admin::UsersController < Admin::BaseController
   # GET /users
   # GET /users.xml
   def index
+    @criteria = (params[:search] || {})
     conditions = []
     condition_params = []
     query_type = ' AND '
         
-    unless params[:search].nil?
-      params[:search].each do |key,value|
-        unless value.blank? || !User.new.respond_to?(key)
-          conditions << "users.#{key.to_s} LIKE ?"
-          condition_params << "%#{value}%"
-        end
+    @criteria.each do |key,value|
+      unless value.blank? || !User.new.respond_to?(key)
+        conditions << "users.#{key.to_s} LIKE ?"
+        condition_params << "%#{value}%"
       end
-        
-      query_type = ' OR ' if (params[:search][:query_type] || '') == 'any'
     end
+      
+    query_type = ' OR ' if (@criteria[:query_type] || '') == 'any'
         
     @users = User.paginate :page => params[:page], :per_page => 20, :order => sort_order(:default => 'asc'), :conditions => condition_params.unshift(conditions.join(query_type))
 

data/app/views/admin/users/index.html.erb

@@ -46,18 +46,18 @@
   <% form_for :search, :html => {:method => :get} do |f| %>
     <p>
       <%= f.label :name %><br/>
-      <%= f.text_field :name, :value => params[:search][:name] %>
+      <%= f.text_field :name, :value => (@criteria[:name] || '') %>
     </p>
     <p>
       <%= f.label :email %><br/>
-      <%= f.text_field :email, :value => params[:search][:email] %>
+      <%= f.text_field :email, :value => (@criteria[:email] || '') %>
     </p>
     <p>
       <%= f.submit "Filter", :disable_with => 'Filtering...' %> 
       <%= f.label :query_type_all, "all" %>
-      <%= f.radio_button :query_type, 'all', :checked => ('checked' if (params[:search][:query_type] || 'all') == 'all'), :title => 'Match ALL criteria above.' %> 
+      <%= f.radio_button :query_type, 'all', :checked => ('checked' if (@criteria[:query_type] || 'all') == 'all'), :title => 'Match ALL criteria above.' %> 
       <%= f.label :query_type_any, "any" %>
-      <%= f.radio_button :query_type, 'any', :checked => ('checked' if (params[:search][:query_type] || '') == 'any'), :title => 'Match ANY criteria above.' %>
+      <%= f.radio_button :query_type, 'any', :checked => ('checked' if (@criteria[:query_type] || '') == 'any'), :title => 'Match ANY criteria above.' %>
     </p>  
   <% end -%>
 

data/beef-admin_area.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beef-admin_area}
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: beef-admin_area
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Steve England