it-logica-application-backbone 1.3.15 → 1.3.16

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.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.3.15
1
+ 1.3.16
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "it-logica-application-backbone"
8
- s.version = "1.3.15"
8
+ s.version = "1.3.16"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Ladas"]
@@ -427,7 +427,7 @@ module ModelMixins
427
427
  end
428
428
 
429
429
  def filter(object, settings, params, per_page = 10, total_count = nil)
430
- inactive_columns = get_columns_with_inactive_filter
430
+ inactive_columns = get_columns_with_inactive_filter settings
431
431
 
432
432
 
433
433
  order_by = params[:real_order_by]
@@ -702,10 +702,10 @@ module ModelMixins
702
702
  ret
703
703
  end
704
704
 
705
- def get_columns_with_inactive_filter
705
+ def get_columns_with_inactive_filter settings
706
706
  inactive_cols = []
707
- settings[:columns].each do |c|
708
- if c[:inactive_filter]
707
+ settings[:columns].each do |col|
708
+ if col[:inactive_filter]
709
709
  inactive_cols << "#{col[:table]}.#{col[:name]}"
710
710
  end
711
711
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: it-logica-application-backbone
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.15
4
+ version: 1.3.16
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2013-04-23 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: htmlentities
16
- requirement: &70030660 !ruby/object:Gem::Requirement
16
+ requirement: &81743460 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70030660
24
+ version_requirements: *81743460
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: jquery-rails
27
- requirement: &70029470 !ruby/object:Gem::Requirement
27
+ requirement: &81742640 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - =
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 2.1.3
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70029470
35
+ version_requirements: *81742640
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: shoulda
38
- requirement: &70027830 !ruby/object:Gem::Requirement
38
+ requirement: &81740930 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70027830
46
+ version_requirements: *81740930
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rdoc
49
- requirement: &73005340 !ruby/object:Gem::Requirement
49
+ requirement: &84606210 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '3.12'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *73005340
57
+ version_requirements: *84606210
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: bundler
60
- requirement: &73004400 !ruby/object:Gem::Requirement
60
+ requirement: &84605150 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 1.1.0
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *73004400
68
+ version_requirements: *84605150
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: jeweler
71
- requirement: &73003530 !ruby/object:Gem::Requirement
71
+ requirement: &84604210 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: 1.8.4
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *73003530
79
+ version_requirements: *84604210
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: simplecov
82
- requirement: &73002570 !ruby/object:Gem::Requirement
82
+ requirement: &84603380 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *73002570
90
+ version_requirements: *84603380
91
91
  description: longer description of your gem
92
92
  email: ladislav.smola@it-logica.cz
93
93
  executables: []
@@ -633,7 +633,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
633
633
  version: '0'
634
634
  segments:
635
635
  - 0
636
- hash: 2123661
636
+ hash: 372865135
637
637
  required_rubygems_version: !ruby/object:Gem::Requirement
638
638
  none: false
639
639
  requirements: