tabulatr2 0.8.3 → 0.8.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/tabulatr/data/data.rb +4 -1
- data/lib/tabulatr/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f040295cd2078f84e9b0379bb3de019cfbef72fd
|
|
4
|
+
data.tar.gz: fffd809f5632e690cfd1506ea37e936e28c4ce27
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d235adcae54d4509002c521f03fd68e97f79f590a103b1a91b07fecf91d09b02d372aaf7f3601cf0cace1c3462df04f444aeeea0fbae9774197ea46fbf2af689
|
|
7
|
+
data.tar.gz: 8e96e7988fd8bd40b496625fce9e063352109cce1ad3b7955ff4758b62e0c5442a9a138f1adcefd3415a136308cb29cfbe3629788fa9250060df988700995e7f
|
data/lib/tabulatr/data/data.rb
CHANGED
|
@@ -44,6 +44,10 @@ class Tabulatr::Data
|
|
|
44
44
|
@batch_actions = block if block_given?
|
|
45
45
|
|
|
46
46
|
execute_batch_actions(batch_params(params), check_params(params))
|
|
47
|
+
|
|
48
|
+
# count
|
|
49
|
+
total = @relation.count
|
|
50
|
+
|
|
47
51
|
# prepare the query
|
|
48
52
|
apply_filters(filter_params params)
|
|
49
53
|
apply_search(search_param params)
|
|
@@ -60,7 +64,6 @@ class Tabulatr::Data
|
|
|
60
64
|
|
|
61
65
|
append = params[:append].present? ? Tabulatr::Utility.string_to_boolean(params[:append]) : false
|
|
62
66
|
|
|
63
|
-
total = @relation.unscope(:where, :limit, :offset).count
|
|
64
67
|
|
|
65
68
|
# prepare result for rendering
|
|
66
69
|
found.define_singleton_method(:__pagination) do
|
data/lib/tabulatr/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: tabulatr2
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.8.
|
|
4
|
+
version: 0.8.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Peter Horn
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2013-11-
|
|
13
|
+
date: 2013-11-05 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: rails
|