admin_views 0.1 → 0.2

data/generators/admin_views/templates/controllers/controller.rb

@@ -1,11 +1,20 @@
 class Admin::<%= pluralize(model_class) %>Controller < Admin::AdminController
+  helper_method :order_param
+  
   # GET /admin/<%= model_plural %>
   def index
     if params[:search]
-      # TODO: By default search all text fields
-      @<%= model_plural %> = <%= model_class %>.paginate(:all, :page => params[:page])
+      sql, sql_params = [], []
+      # By default searches all text fields
+<% search_cols = columns.find_all {|col| [:text, :string].include?(col.type) }.collect {|col| "'#{col.name}'" }.join(",") -%>
+      [<%= search_cols %>].each do |col|
+        sql << "#{col} LIKE ?"
+        sql_params << "%#{params[:search]}%"
+      end
+      conditions = [sql.join(" OR "), sql_params].flatten
+      @<%= model_plural %> = <%= model_class %>.paginate(:all, :page => params[:page], :conditions => conditions, :order => order_sql(params))
     else
-      @<%= model_plural %> = <%= model_class %>.paginate(:all, :page => params[:page])
+      @<%= model_plural %> = <%= model_class %>.paginate(:all, :page => params[:page], :order => order_sql(params))
     end
   end
  
@@ -53,4 +62,26 @@ class Admin::<%= pluralize(model_class) %>Controller < Admin::AdminController
 
     redirect_to(admin_<%= model_plural %>_url)
   end
+  
+  private
+    def order_sql(params)
+      if params[:order]
+        split = params[:order].split("_")
+        order = split.last.upcase
+        column = split[0..-2].join("_")
+        "#{column} #{order}"
+      end
+    end
+  
+    def order_param(col_name)
+      order = params[:order]
+      
+      if order == "#{col_name}_asc"
+        "#{col_name}_asc"
+      elsif order == "#{col_name}_desc"
+        "#{col_name}_desc"
+      else
+        "#{col_name}_asc"
+      end
+    end
 end

data/generators/admin_views/templates/views/index.html.erb

@@ -3,18 +3,31 @@
 </div>
 
 <div id="search">
-  
+  <form method="get">
+    <%%= text_field_tag 'search', params[:search] %>
+    <%%= submit_tag "Search" %>
+  </form>
 </div>
 
 <h2><%= model_class %></h2>
 <table>
   <tr>
-<% for col in columns -%>
-    <th><%= col.human_name %></th>
+<% columns.each do |col| -%>
+    <th><%%= link_to '<%= col.human_name %>', params.merge(:order => order_param('<%= col.name %>')) %></th>
 <% end -%>
     <th></th>
   </tr>
-  <%%= render @<%= model_plural %> %>
+<%% @<%= model_plural %>.each do |<%= model_name %>| %>
+  <tr id="<%= model_name %>_<%%= <%= model_name %>.id %>">
+<% columns.each do |col| -%>
+    <td><%%= h <%= model_name %>.<%= col.name %> %></td>
+<% end -%>
+    <td>
+      <%%= link_to "Edit", edit_admin_<%= model_name %>_path(<%= model_name %>) %>
+      <%%= link_to "Delete", admin_<%= model_name %>_path(<%= model_name %>), :method => :delete, :confirm => "Are you sure?" %>
+    </td>
+  </tr>
+<%% end -%>
 </table>
 
 <%%= will_paginate @<%= model_plural %> %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: admin_views
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors: 
 - Conor Hunt
@@ -32,7 +32,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.7
     version: 
-description: Rails generator to create admin views for models
+description: Rails generator to create admin scaffolding with searching and sorting for models
 email: conor.hunt@gmail.com
 executables: []
 
@@ -47,7 +47,6 @@ files:
 - generators/admin_views/admin_views_generator.rb
 - generators/admin_views/templates/controllers/controller.rb
 - generators/admin_views/templates/views/_form.html.erb
-- generators/admin_views/templates/views/_model.html.erb
 - generators/admin_views/templates/views/edit.html.erb
 - generators/admin_views/templates/views/index.html.erb
 - generators/admin_views/templates/views/new.html.erb
@@ -79,6 +78,6 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Rails generator to create admin views for models
+summary: Rails generator to create admin scaffolding with searching and sorting for models
 test_files: []
 

data/generators/admin_views/templates/views/_model.html.erb

@@ -1,9 +0,0 @@
-<tr id="<%= model_name %>_<%%= <%= model_name %>.id %>">
-<% for col in columns -%>
-  <td><%%= h <%= model_name %>.<%= col.name %> %></td>
-<% end -%>
-  <td>
-    <%%= link_to "Edit", edit_admin_<%= model_name %>_path(<%= model_name %>) %>
-    <%%= link_to "Delete", admin_<%= model_name %>_path(<%= model_name %>), :method => :delete, :confirm => "Are you sure?" %>
-  </td>
-</tr>