sferik-merb-admin 0.1.8 → 0.1.9

data/README.markdown

@@ -14,7 +14,7 @@ At the command prompt, type:
 
 In your app, add the following dependency to `config/dependencies.rb`:
 
-    dependency "sferik-merb-admin", "0.1.8", :require_as => "merb-admin"
+    dependency "sferik-merb-admin", "0.1.9", :require_as => "merb-admin"
 
 Add the following route to `config/router.rb`:
 

data/Rakefile

@@ -12,7 +12,7 @@ AUTHOR = "Erik Michaels-Ober"
 EMAIL = "sferik@gmail.com"
 HOMEPAGE = "http://twitter.com/sferik"
 SUMMARY = "MerbAdmin is a merb slice that provides an easy-to-use interface for managing your data."
-GEM_VERSION = "0.1.8"
+GEM_VERSION = "0.1.9"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"

data/app/controllers/forms.rb

@@ -24,6 +24,17 @@ class MerbAdmin::Forms < MerbAdmin::Application
       }.merge(options)
       @instances = @model.all(options).reverse
     else
+      if params[:query]
+        condition_statement = []
+        conditions = []
+        @properties.each do |property|
+          next unless property.primitive.to_s == "String"
+          condition_statement << "#{property.field} LIKE ?"
+          conditions << "%#{params[:query]}%"
+        end
+        conditions.unshift(condition_statement.join(" OR "))
+        options.merge!(:conditions => conditions) unless conditions == [""]
+      end
       # monkey patch pagination
       @model.class_eval("is_paginated") unless @model.respond_to?(:paginated)
       @current_page = (params[:page] || 1).to_i
@@ -32,7 +43,10 @@ class MerbAdmin::Forms < MerbAdmin::Application
         :per_page => 100,
       }.merge(options)
       @page_count, @instances = @model.paginated(options)
+      options.delete(:page)
+      options.delete(:per_page)
     end
+    @record_count = @model.count(options)
     render(:layout => "list")
   end
 

data/app/views/forms/list.html.erb

@@ -1,3 +1,4 @@
+<% params = request.params.except(:action, :controller, :model_name) %>
         <div id="content-main">
           <ul class="object-tools">
             <li>
@@ -5,9 +6,26 @@
             </li>
           </ul>
           <div class="module filtered" id="changelist">
+            <div id="toolbar">
+              <form id="changelist-search" action="" method="get">
+              <div>
+                <label for="searchbar"><img src="<%= image_path("icon_searchbox.png") %>" alt="Search" /></label>
+                <input type="text" size="40" name="query" value="" id="searchbar" />
+                <input type="submit" value="Search" />
+                <% if params[:query] || params[:filter] %>
+                <span class="small quiet"><%= @record_count %> <%= @record_count == 1 ? "result" : "results" %> (<a href="?"><%= @model.count %> total</a>)</span>
+                <% end %>
+                <% if params[:filter] %>
+                <% params[:filter].each do |name, value| %>
+                <input type="hidden" name="filter[<%= name %>]" value="<%= value %>"/>
+                <% end %>
+                <% end %>
+              </div>
+              </form>
+            </div>
+            <script type="text/javascript">document.getElementById("searchbar").focus();</script>
             <div id="changelist-filter">
               <h2>Filter</h2>
-              <% params = request.params.except(:action, :controller, :model_name) %>
               <% @properties.each do |property| %>
               <% if property.primitive.to_s == "TrueClass" %>
               <h3>By <%= property.field.gsub('_', ' ') %></h3>
@@ -87,13 +105,13 @@
               </tbody>
             </table>
             <p class="paginator">
-            <% if @page_count.to_i > 1 %>
-              <%= paginate(@current_page, @page_count, :url => slice_url(:admin_list, :model_name => @model_name.snake_case)) %>
-            <% end %>
-              <%= @model.count %> <%= @model.count == 1 ? @model_name.snake_case.gsub('_', ' ') : @model_name.snake_case.gsub('_', ' ').pluralize %>
-            <% if @page_count.to_i == 2 %>
-              <%= link_to("Show all", slice_url(:admin_list, :model_name => @model_name.snake_case, :all => true), :class => "showall") %>
-            <% end %>
+              <% if @page_count.to_i > 1 %>
+              <%= paginate(@current_page, @page_count, :url => '?' + Merb::Parse.params_to_query_string(params)) %>
+              <% end %>
+              <%= @record_count %> <%= @record_count == 1 ? @model_name.snake_case.gsub('_', ' ') : @model_name.snake_case.gsub('_', ' ').pluralize %>
+              <% if @page_count.to_i == 2 %>
+              <%= link_to("Show all", '?' + Merb::Parse.params_to_query_string(params.merge(:all => true)), :class => "showall") %>
+              <% end %>
             </p>
           </div>
         </div>

data/lib/merb-admin.rb

@@ -22,7 +22,7 @@ if defined?(Merb::Plugins)
     
     # Slice metadata
     self.description = "MerbAdmin is a merb slice that uses your DataMapper models to provide an easy-to-use, Django-style interface for content managers."
-    self.version = "0.1.8"
+    self.version = "0.1.9"
     self.author = "Erik Michaels-Ober"
     
     # Stub classes loaded hook - runs before LoadClasses BootLoader

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sferik-merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-08 00:00:00 -07:00
+date: 2009-08-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency