smarter_listing 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d05a172b3029cc17e43a0c56a096add42d07a71
-  data.tar.gz: dece1ac2a042bdfaa6046b3b9cac13b7adbd99c1
+  metadata.gz: 0a4b098e6859a2cc16de163f6295db108c24b812
+  data.tar.gz: cc45839c66358ba89e81e3f71f63e4ac2f5e7de4
 SHA512:
-  metadata.gz: d06b4d512a10c508cabf6fac5a9a9515a677174fc1997326326fc2b2a12a282f945b558e49fc4439250dbc1c206d6090d4ee76521125765d7a18b15479bc175a
-  data.tar.gz: 5f62310e2902ec88004ab7f49de0cbf7593ec525b98eb57e87955aa1057b63bd4f92d78cbfa5eaf93212bc89db2b49deec3f4a50259f516cb1dfbb6b0e0eb253
+  metadata.gz: d1f2c8967b4d98c2ba1123633f17628eef0165b2d5d5c0148168d8d53f22000d6b834fe3ed968724dbe4d64e516ae3ca26d749f9cf718ad296b074890b837150
+  data.tar.gz: ca8e4850691842b0c13bd99bb3f6435ad60c8797215ef6a455d2fc92cec61d89614d2d1b410ff98801d4e6f58c7fdb85cb5380e1fe94c41d4084b00af4fcac38

data/app/views/smart_listing/_action_copy.html.erb

@@ -1,3 +1,3 @@
-<%=link_to action[:custom_url], {class: action[:name], title: action[:custom_title], remote: true, method: :put}, action[:html_options] do %>
+<%= link_to *[action[:custom_url], {title: action[:custom_title], remote: true, method: :patch, class: action[:name]}, action[:html_options]].compact do %>
   <i class="<%= action[:custom_icon] %>"></i>
 <% end %>

data/app/views/smarter_listing/create.js.erb

@@ -1 +1,2 @@
-<%= smart_listing_item collection_sym, :create, resource, resource.valid? ? "#{resource_view_path}/#{table_name.to_s.singularize}" : "#{resource_view_path}/form.html" %>
+<%= smart_listing_item collection_sym, :create, resource, resource.valid? ? "#{resource_view_path}/#{table_name.to_s.singularize}" : "#{resource_view_path}/form.html" %>
+<%== render 'smarter_listing/form_logic' unless resource.valid? %>

data/app/views/smarter_listing/update.js.erb

@@ -1 +1,2 @@
-<%= smart_listing_item collection_sym, :update, resource, resource.valid? ? "#{resource_view_path}/#{model.name.demodulize.underscore}" : "#{resource_view_path}/form.html" %>
+<%= smart_listing_item collection_sym, :update, resource, resource.valid? ? "#{resource_view_path}/#{model.name.demodulize.underscore}" : "#{resource_view_path}/form.html" %>
+<%== render 'smarter_listing/form_logic' unless resource.valid? %>

data/lib/smarter_listing/controller_extension.rb

@@ -53,12 +53,25 @@ module SmarterListing::ControllerExtension
     render 'smarter_listing/destroy'
   end
 
+  def restore
+    resource.current_user = current_user if resource.respond_to?(:current_user=)
+    resource.restore!
+    index
+  end
+
   def filter_parameter
     self.class.instance_variable_get :@filter_parameter
   end
 
   def filtered(model)
-    results = model.all
+    results = if params[:show_deleted] == "1" && model.instance_methods.include?(:deleted?)
+                if model.column_names.include?("deleted_at")
+                  model.only_deleted
+                else
+                  results.map(&:deleted?)
+                end
+              end
+    results ||= model.all
     unless params[filter_parameter].blank?
       if model.respond_to?(:search)
         results = results.search { fulltext "#{params[filter_parameter]}" }.results
@@ -66,13 +79,6 @@ module SmarterListing::ControllerExtension
         results = results.where("name LIKE ?", "%#{params[filter_parameter]}%")
       end
     end
-    if params[:show_deleted] == "1" && model.instance_methods.include?(:deleted?)
-      if model.column_names.include?("deleted_at")
-        results = results.where.not(deleted_at: nil)
-      else
-        results = results.where.not(status: model.statuses[:deleted])
-      end
-    end
     results
   end
 

data/lib/smarter_listing/version.rb

@@ -1,3 +1,3 @@
 module SmarterListing
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smarter_listing
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Michael Sprauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-13 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails