brainsome_typus 4.0.0.beta10 → 4.0.0.beta11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60716463177eb504895b4eba5eabc96cfd1d5f11
-  data.tar.gz: 145ba5fdabbc94671d1642801756ec7c15112c35
+  metadata.gz: ebc9225f4ac1fb047dadd8cd4bc75a0bd73dff5c
+  data.tar.gz: 4b76f9a70dc3dbe3954835b193b54bb0383f1fe5
 SHA512:
-  metadata.gz: cc56f497cf75fedc98635e26837fd401d8a72dc90fea0e974789970d0b7c521eb56c137f85c37bb1d140594186ad4d3fab2cb856f2fb12dc945a6a6c39a6ea8e
-  data.tar.gz: 607d0a616909a0848d05b82fd5e9457f2e770cc59e9a55f174f52655493c52e60bc9c91d765c05fc9daac62852e825d1b2f85d38f6426a82a43a97fdd4e359a4
+  metadata.gz: 651550029c2d1d4022d2455722ce70902fe4ba112ba169731271f9643630474f5b7c62778e64fb4a495105821999745942c3ab1148b031594b04487887da1e96
+  data.tar.gz: e0e6f80ec816924ce0a62d5d01a5cff06d01c4477e8a3f6b30d2962562f26ab7ec55cfa1776004a13805e60ec85bf6a5db42065db51acbe63af93d2d9f34750e

data/app/controllers/admin/resources_controller.rb

@@ -222,7 +222,7 @@ class Admin::ResourcesController < Admin::BaseController
     message = params[:action].eql?('create') ? "%{model} successfully created." : "%{model} successfully updated."
     notice = Typus::I18n.t(message, :model => @resource.model_name.human)
 
-    redirect_to path.merge!(options).compact, :notice => notice
+    redirect_to path.merge!(options).compact.to_hash, :notice => notice
   end
 
   def set_default_action

data/app/helpers/admin/resources/filters_helper.rb

@@ -1,6 +1,6 @@
 module Admin::Resources::FiltersHelper
 
-  def build_filters(resource = @resource, params = params())
+  def build_filters(resource = @resource, local_params = params)
     if (typus_filters = resource.typus_filters).any?
       locals = {}
 
@@ -10,7 +10,7 @@ module Admin::Resources::FiltersHelper
                          end
 
       rejections = %w(controller action locale utf8 sort_order order_by) + locals[:filters].map { |f| f[:key] }
-      locals[:hidden_filters] = params.dup.delete_if { |k, v| rejections.include?(k) }
+      locals[:hidden_filters] = local_params.dup.delete_if { |k, v| rejections.include?(k) }
 
       render "helpers/admin/resources/filters", locals
     end

data/app/helpers/admin/resources/table_helper.rb

@@ -13,26 +13,26 @@ module Admin::Resources::TableHelper
     render "helpers/admin/resources/table", locals
   end
 
-  def table_header(model, fields, params = params())
+  def table_header(model, fields, local_params = params)
     fields.map do |key, value|
 
       key = key.gsub(".", " ") if key.to_s.match(/\./)
       content = model.human_attribute_name(key)
 
-      if params[:action].eql?('index') && model.typus_options_for(:sortable)
+      if local_params[:action].eql?('index') && model.typus_options_for(:sortable)
         association = model.reflect_on_association(key.to_sym)
         order_by = association ? association.foreign_key : key
 
         if (model.model_fields.map(&:first).map(&:to_s).include?(key) || model.reflect_on_all_associations(:belongs_to).map(&:name).include?(key.to_sym))
-          sort_order = case params[:sort_order]
+          sort_order = case local_params[:sort_order]
                        when 'asc' then ['desc', '↓']
                        when 'desc' then ['asc', '↑']
                        else [nil, nil]
                        end
-          switch = sort_order.last if params[:order_by].eql?(order_by)
+          switch = sort_order.last if local_params[:order_by].eql?(order_by)
           options = { :order_by => order_by, :sort_order => sort_order.first }
           message = [content, switch].compact.join(" ").html_safe
-          content = link_to(message, params.merge(options))
+          content = link_to(message, local_params.merge(options))
         end
       end
 

data/app/helpers/admin/resources_helper.rb

@@ -1,9 +1,9 @@
 module Admin::ResourcesHelper
 
-  def admin_search(resource = @resource, params = params())
+  def admin_search(resource = @resource, local_params = params)
     if (typus_search = resource.typus_defaults_for(:search)) && typus_search.any?
 
-      hidden_filters = params.dup
+      hidden_filters = local_params.dup
       rejections = %w(controller action locale utf8 sort_order order_by search page)
       hidden_filters.delete_if { |k, v| rejections.include?(k) }
 

data/lib/typus/version.rb

@@ -3,7 +3,7 @@ module Typus
     MAJOR = 4
     MINOR = 0
     TINY  = 0
-    PRE   = "beta10"
+    PRE   = "beta11"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brainsome_typus
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta10
+  version: 4.0.0.beta11
 platform: ruby
 authors:
 - Francesc Esplugas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby