wice_grid 3.4.4 → 3.4.5

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.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/wice_grid.rb +6 -1
  3. data/wice_grid.gemspec +2 -2
  4. metadata +8 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2649897e99bfa161569cd2e9a3695d80e7c7b42e
4
- data.tar.gz: 20044581265804bcab1659507947e2744b282fb7
3
+ metadata.gz: 5e913c8334e69dc2a9c578d383753beb7fcc6cdb
4
+ data.tar.gz: 515fa3c1e45512d7f386126ea5e809acb17caf91
5
5
  SHA512:
6
- metadata.gz: 5298b06ff32dd594d875fdb4b878242ec628bc2c1f2329059f13678e6b01042537a4525792944989c6a6978c87e5cead7d7883cbb648ea06e82a6a8c715a9f01
7
- data.tar.gz: 9ee4a62edf8a11c96e13224bd8864c50c75ea990a54cd1f244f6b9cb1034a986d9485ca256e3875f1c64f1a221409332dcd44af55b7728ae628328cab9afb531
6
+ metadata.gz: 2a083e373ad835ce7f4a05831434bd5dff65a61f721c4c6673c2494d857687f992ea7fc61662099d30daa30e4844bd1d78f441e718ba687a847849354c572ece
7
+ data.tar.gz: 644ff92522639112d09017e532c30137803112bff1bed615c8fdcf3b9911ce28c44256cebf852f3a2ec382712ab098874ea9afeb1ed55003d46fc31465706124
data/lib/wice_grid.rb CHANGED
@@ -293,7 +293,7 @@ module Wice
293
293
 
294
294
  else
295
295
  # p @ar_options
296
- @relation.
296
+ relation = @relation.
297
297
  page( @ar_options[:page]).
298
298
  per( @ar_options[:per_page]).
299
299
  includes(@ar_options[:include]).
@@ -301,6 +301,11 @@ module Wice
301
301
  order( @ar_options[:order]).
302
302
  where( @ar_options[:conditions])
303
303
 
304
+ if relation.respond_to?(:references)
305
+ relation = relation.references(@ar_options[:include])
306
+ end
307
+
308
+ relation
304
309
  end
305
310
  end
306
311
  invoke_resultset_callbacks
data/wice_grid.gemspec CHANGED
@@ -1,8 +1,8 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'wice_grid'
3
- s.version = '3.4.4'
3
+ s.version = '3.4.5'
4
4
  s.homepage = 'https://github.com/leikind/wice_grid'
5
- s.date = '2014-07-03'
5
+ s.date = '2014-08-23'
6
6
  s.summary = 'A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters.'
7
7
  s.description = 'A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters.' +
8
8
  'One of the goals of this plugin was to allow the programmer to define the contents of the cell by himself, ' +
metadata CHANGED
@@ -1,27 +1,27 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wice_grid
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.4.4
4
+ version: 3.4.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yuri Leikind
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-07-03 00:00:00.000000000 Z
11
+ date: 2014-08-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: kaminari
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
17
+ - - '>='
18
18
  - !ruby/object:Gem::Version
19
19
  version: 0.13.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ">="
24
+ - - '>='
25
25
  - !ruby/object:Gem::Version
26
26
  version: 0.13.0
27
27
  description: A Rails grid plugin to create grids with sorting, pagination, and (automatically
@@ -35,7 +35,7 @@ executables: []
35
35
  extensions: []
36
36
  extra_rdoc_files: []
37
37
  files:
38
- - ".gitignore"
38
+ - .gitignore
39
39
  - CHANGELOG
40
40
  - Gemfile
41
41
  - MIT-LICENSE
@@ -112,17 +112,17 @@ require_paths:
112
112
  - lib
113
113
  required_ruby_version: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ">="
115
+ - - '>='
116
116
  - !ruby/object:Gem::Version
117
117
  version: '0'
118
118
  required_rubygems_version: !ruby/object:Gem::Requirement
119
119
  requirements:
120
- - - ">="
120
+ - - '>='
121
121
  - !ruby/object:Gem::Version
122
122
  version: '0'
123
123
  requirements: []
124
124
  rubyforge_project:
125
- rubygems_version: 2.2.2
125
+ rubygems_version: 2.0.3
126
126
  signing_key:
127
127
  specification_version: 3
128
128
  summary: A Rails grid plugin to create grids with sorting, pagination, and (automatically