bhf 1.0.0.beta17 → 1.0.0.beta18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/app/controllers/bhf/pages_controller.rb +1 -1
- data/app/helpers/bhf/pages_helper.rb +3 -3
- data/app/views/bhf/pages/_search.html.haml +1 -1
- data/bhf.gemspec +2 -2
- data/lib/bhf/platform/pagination.rb +2 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2b5298af67d1ce81fd480ff168ea34424fd68c3a523fb01a9b9b75db5bf0d407
|
|
4
|
+
data.tar.gz: ba5c1c87b5ce5bf6973ad2c9129d411ebd4f5ee02a2a3c10337d995281225684
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a3ad8e0e543832cdfbafa9d76a90aae827f39d9fd7610af7b0e57cd7b220f5d069f253df3c1c46a9f9c24b773696f886d108b82223dc6e959a5bbb02d9563659
|
|
7
|
+
data.tar.gz: 4ea00b40824a778a7155bef419819fd59438aa7ded663399856b34dd1cdad5565285c0ec3da6ee0c385b97fbc378d6f361b9727557b4d7de94068f478ffa9790
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
1.0.0.
|
|
1
|
+
1.0.0.beta18
|
|
@@ -8,7 +8,7 @@ class Bhf::PagesController < Bhf::ApplicationController
|
|
|
8
8
|
|
|
9
9
|
if request.headers['X-Requested-With'] == 'XMLHttpRequest'
|
|
10
10
|
params.each do |key, value|
|
|
11
|
-
return render_platform(key) if value.is_a?(ActionController::Parameters)
|
|
11
|
+
return render_platform(key) if value.is_a?(ActionController::Parameters)
|
|
12
12
|
end
|
|
13
13
|
end
|
|
14
14
|
|
|
@@ -2,16 +2,16 @@ module Bhf
|
|
|
2
2
|
module PagesHelper
|
|
3
3
|
|
|
4
4
|
def get_value(key, p)
|
|
5
|
-
return unless p.is_a?(
|
|
5
|
+
return unless p.is_a?(ActionController::Parameters)
|
|
6
6
|
|
|
7
|
-
return p[key[0]][key[1]] if key.is_a?(Array) && p[key[0]].is_a?(
|
|
7
|
+
return p[key[0]][key[1]] if key.is_a?(Array) && p[key[0]].is_a?(ActionController::Parameters) && p[key[0]][key[1]].is_a?(String) #omg
|
|
8
8
|
|
|
9
9
|
p[key] if p[key] && p[key].is_a?(String)
|
|
10
10
|
end
|
|
11
11
|
|
|
12
12
|
def current_order_path(order_by, platform_name)
|
|
13
13
|
params_platfrom = params[platform_name] ? params[platform_name].clone : ActionController::Parameters.new({})
|
|
14
|
-
params_platfrom.permit!
|
|
14
|
+
params_platfrom.permit!
|
|
15
15
|
|
|
16
16
|
if params_platfrom['order'] == order_by && params_platfrom['direction'] != 'desc'
|
|
17
17
|
params_platfrom['direction'] = 'desc'
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
- if platform.search_field?
|
|
11
11
|
= s.text_field :text, value: get_value([:search, :text], p), placeholder: t('bhf.helpers.searchform.placeholder')
|
|
12
12
|
|
|
13
|
-
- if p && p[:search].is_a?(
|
|
13
|
+
- if p && p[:search].is_a?(ActionController::Parameters)
|
|
14
14
|
- p[:search].each do |key, value|
|
|
15
15
|
= s.hidden_field key, value: value, id: nil, class: (:hidden_search if key == 'text')
|
|
16
16
|
|
data/bhf.gemspec
CHANGED
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
# DO NOT EDIT THIS FILE DIRECTLY
|
|
3
3
|
# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
|
|
4
4
|
# -*- encoding: utf-8 -*-
|
|
5
|
-
# stub: bhf 1.0.0.
|
|
5
|
+
# stub: bhf 1.0.0.beta18 ruby lib
|
|
6
6
|
|
|
7
7
|
Gem::Specification.new do |s|
|
|
8
8
|
s.name = "bhf".freeze
|
|
9
|
-
s.version = "1.0.0.
|
|
9
|
+
s.version = "1.0.0.beta18".freeze
|
|
10
10
|
|
|
11
11
|
s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
|
|
12
12
|
s.require_paths = ["lib".freeze]
|
|
@@ -73,7 +73,8 @@ module Bhf::Platform
|
|
|
73
73
|
|
|
74
74
|
parsed_paramas = {
|
|
75
75
|
bhf_area: template.params[:bhf_area],
|
|
76
|
-
page: template.params[:page]
|
|
76
|
+
page: template.params[:page],
|
|
77
|
+
format: nil
|
|
77
78
|
}.merge(platform.name.to_sym => platform_params)
|
|
78
79
|
template.link_to(
|
|
79
80
|
I18n.t("bhf.pagination.load_#{direction}"),
|