brainsome_typus 4.0.0.beta10 → 4.0.0.beta11
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ebc9225f4ac1fb047dadd8cd4bc75a0bd73dff5c
|
4
|
+
data.tar.gz: 4b76f9a70dc3dbe3954835b193b54bb0383f1fe5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 651550029c2d1d4022d2455722ce70902fe4ba112ba169731271f9643630474f5b7c62778e64fb4a495105821999745942c3ab1148b031594b04487887da1e96
|
7
|
+
data.tar.gz: e0e6f80ec816924ce0a62d5d01a5cff06d01c4477e8a3f6b30d2962562f26ab7ec55cfa1776004a13805e60ec85bf6a5db42065db51acbe63af93d2d9f34750e
|
@@ -222,7 +222,7 @@ class Admin::ResourcesController < Admin::BaseController
|
|
222
222
|
message = params[:action].eql?('create') ? "%{model} successfully created." : "%{model} successfully updated."
|
223
223
|
notice = Typus::I18n.t(message, :model => @resource.model_name.human)
|
224
224
|
|
225
|
-
redirect_to path.merge!(options).compact, :notice => notice
|
225
|
+
redirect_to path.merge!(options).compact.to_hash, :notice => notice
|
226
226
|
end
|
227
227
|
|
228
228
|
def set_default_action
|
@@ -1,6 +1,6 @@
|
|
1
1
|
module Admin::Resources::FiltersHelper
|
2
2
|
|
3
|
-
def build_filters(resource = @resource,
|
3
|
+
def build_filters(resource = @resource, local_params = params)
|
4
4
|
if (typus_filters = resource.typus_filters).any?
|
5
5
|
locals = {}
|
6
6
|
|
@@ -10,7 +10,7 @@ module Admin::Resources::FiltersHelper
|
|
10
10
|
end
|
11
11
|
|
12
12
|
rejections = %w(controller action locale utf8 sort_order order_by) + locals[:filters].map { |f| f[:key] }
|
13
|
-
locals[:hidden_filters] =
|
13
|
+
locals[:hidden_filters] = local_params.dup.delete_if { |k, v| rejections.include?(k) }
|
14
14
|
|
15
15
|
render "helpers/admin/resources/filters", locals
|
16
16
|
end
|
@@ -13,26 +13,26 @@ module Admin::Resources::TableHelper
|
|
13
13
|
render "helpers/admin/resources/table", locals
|
14
14
|
end
|
15
15
|
|
16
|
-
def table_header(model, fields,
|
16
|
+
def table_header(model, fields, local_params = params)
|
17
17
|
fields.map do |key, value|
|
18
18
|
|
19
19
|
key = key.gsub(".", " ") if key.to_s.match(/\./)
|
20
20
|
content = model.human_attribute_name(key)
|
21
21
|
|
22
|
-
if
|
22
|
+
if local_params[:action].eql?('index') && model.typus_options_for(:sortable)
|
23
23
|
association = model.reflect_on_association(key.to_sym)
|
24
24
|
order_by = association ? association.foreign_key : key
|
25
25
|
|
26
26
|
if (model.model_fields.map(&:first).map(&:to_s).include?(key) || model.reflect_on_all_associations(:belongs_to).map(&:name).include?(key.to_sym))
|
27
|
-
sort_order = case
|
27
|
+
sort_order = case local_params[:sort_order]
|
28
28
|
when 'asc' then ['desc', '↓']
|
29
29
|
when 'desc' then ['asc', '↑']
|
30
30
|
else [nil, nil]
|
31
31
|
end
|
32
|
-
switch = sort_order.last if
|
32
|
+
switch = sort_order.last if local_params[:order_by].eql?(order_by)
|
33
33
|
options = { :order_by => order_by, :sort_order => sort_order.first }
|
34
34
|
message = [content, switch].compact.join(" ").html_safe
|
35
|
-
content = link_to(message,
|
35
|
+
content = link_to(message, local_params.merge(options))
|
36
36
|
end
|
37
37
|
end
|
38
38
|
|
@@ -1,9 +1,9 @@
|
|
1
1
|
module Admin::ResourcesHelper
|
2
2
|
|
3
|
-
def admin_search(resource = @resource,
|
3
|
+
def admin_search(resource = @resource, local_params = params)
|
4
4
|
if (typus_search = resource.typus_defaults_for(:search)) && typus_search.any?
|
5
5
|
|
6
|
-
hidden_filters =
|
6
|
+
hidden_filters = local_params.dup
|
7
7
|
rejections = %w(controller action locale utf8 sort_order order_by search page)
|
8
8
|
hidden_filters.delete_if { |k, v| rejections.include?(k) }
|
9
9
|
|
data/lib/typus/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: brainsome_typus
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.0.0.
|
4
|
+
version: 4.0.0.beta11
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Francesc Esplugas
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2015-11-
|
12
|
+
date: 2015-11-17 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bcrypt-ruby
|