effective_datatables 3.3.1 → 3.3.2

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 (5) hide show
  1. checksums.yaml +4 -4
  2. data/app/models/effective/datatable_column_tool.rb +1 -1
  3. data/app/views/effective/datatables/_filters.html.haml +1 -0
  4. data/lib/effective_datatables/version.rb +1 -1
  5. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b6617dd89c63c469a1b13e5cc33d42d17d38f485
4
- data.tar.gz: 35c4b532d397f4b39a44b4f48cca0014ff9c88b2
3
+ metadata.gz: 857e42e50924ee8233abe41df28782d7be6d69cf
4
+ data.tar.gz: b0e9e1d630dfe4c6eab0a67f4086dbddbdb8c9fb
5
5
  SHA512:
6
- metadata.gz: 408903d12b738461044519d44a608f1d231b153098d699fb37ef85010feb0d746d74a924bd437dcfe8f5affde12267230bb56ba9e1bde4f45348e6319d764a30
7
- data.tar.gz: ca62715eec66e12d5dfc332c712ee3fb6c36dcb3aea938dc186a49f6af379e564d69c827f746fc539626a40f8d37005cf0293988ed3983ac13a918dea7db99a8
6
+ metadata.gz: ed11213dafb4ab0e95851d097d782495e2b4fba16a7e4ea65f2e2fdd47c625563e0cd557ab390bf8b97608254fcab2c265e44dc23a55e3926e13899acb66aafb
7
+ data.tar.gz: 0cda62c33023ee13931e407ddc789a15d1f085c558283ee52bdf816262288b036e091dca45cf28ff76146a68604df6407cf4e695a549ff91fc3627b9375af2e1
data/app/models/effective/datatable_column_tool.rb CHANGED
@@ -46,7 +46,7 @@ module Effective
46
46
  collection.order("#{sql_column} #{datatable.resource.sql_direction(direction)}")
47
47
  else
48
48
  Effective::Resource.new(collection)
49
- .order(column[:name], direction, as: column[:as], sort: column[:sort], sql_column: column[:sql_column])
49
+ .order(column[:name], direction, as: column[:as], sort: column[:sort], sql_column: column[:sql_column], limit: datatable.limit)
50
50
  end
51
51
  end
52
52
 
data/app/views/effective/datatables/_filters.html.haml CHANGED
@@ -17,6 +17,7 @@
17
17
  collection: opts[:input_html].delete(:collection),
18
18
  multiple: opts[:input_html].delete(:multiple),
19
19
  input_html: (({name: ''} unless datatable._filters_form_required?) || {}).merge(opts[:input_html]),
20
+ input_js: { placeholder: ''},
20
21
  wrapper_html: {class: 'form-group-sm'}
21
22
 
22
23
  - if datatable._scopes.present? || datatable._filters.present?
data/lib/effective_datatables/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EffectiveDatatables
2
- VERSION = '3.3.1'.freeze
2
+ VERSION = '3.3.2'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_datatables
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.3.1
4
+ version: 3.3.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-10-13 00:00:00.000000000 Z
11
+ date: 2017-10-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - ">="
46
46
  - !ruby/object:Gem::Version
47
- version: 0.3.0
47
+ version: 0.5.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - ">="
53
53
  - !ruby/object:Gem::Version
54
- version: 0.3.0
54
+ version: 0.5.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: sass-rails
57
57
  requirement: !ruby/object:Gem::Requirement