xsdk-scaffold-rails 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75d85ae55d8bef8eadbb1af2b40f558c60279d31408c2378220bf73ea398eada
-  data.tar.gz: ba396e8dc6effc8787e6ed885d77e65ddfd8c56979dd899d8fc86f1da69b7f0d
+  metadata.gz: 9febb86209ef377bac9ac2913c5f9dc7040ffb86217de6bca2144fd8d31cd9c4
+  data.tar.gz: d91f1206b72fb81317896a9b96ab5045f783d99ec5796024c86a9a1ab3a98699
 SHA512:
-  metadata.gz: fe6202b413534c5c6df73eea0f073cfba20c12ad5fc04c7bf580df61699f869c7d32746e36c540d82458f19976b7076a390a51b820d1f76a3503d46c85ce3a21
-  data.tar.gz: 00d7b44019557ea04c309a91ddbb6753cacf37abc5e04f12849e1e1274fb5d2dad72067ed119aba86ab9f100319ef6619c671146a0ab10064b16b4eee771842c
+  metadata.gz: dbbba730369a3f1c38e3cb8e82541f60b6e32d897ef02b5022c2446c4fa02da773495413bc1b180835037c926ed628ee8623afb854bda59b49d92fcf07e99290
+  data.tar.gz: 0cd783af14aeab46f95ae0bdc2675c8a4211ac0735107accd403c92dd1735daa2927fecfe9d9e9699df3ab968d87ce27bb0fab06fff13b2c6772fa64b29c31e6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xsdk-scaffold-rails (0.1.10)
+    xsdk-scaffold-rails (0.1.11)
       activerecord (>= 6.0.0)
       pg (>= 1.1)
 
@@ -42,7 +42,7 @@ GEM
     parallel (1.20.1)
     parser (3.0.1.1)
       ast (~> 2.4.1)
-    pg (1.2.3)
+    pg (1.3.5)
     racc (1.5.2)
     rack (2.2.3)
     rainbow (3.0.0)
@@ -127,4 +127,4 @@ DEPENDENCIES
   xsdk-scaffold-rails!
 
 BUNDLED WITH
-   2.2.17
+   2.3.10

data/lib/xsdk/scaffold/rails/base_datatable.rb

@@ -28,10 +28,16 @@ module Xsdk
           sort = @options[:sortBy]
           direction = @options[:sortDesc]
           order_string = sort.map.with_index { |k, idx| "#{sorting_map[k.to_sym]} #{direction[idx] ? 'DESC' : 'ASC'}" }
-          data.limit(per_page)
-              .offset(page * per_page)
-              .order(order_string)
-              .as_json(methods: methods + enum_methods, except: keys_to_exclude, include: has_many_include)
+          
+          if per_page > 0
+            data = data.limit(per_page).offset(page * per_page)
+          end
+          
+          data.order(order_string).as_json(
+            methods: methods + enum_methods,
+            except: keys_to_exclude,
+            include: has_many_include
+          )
         end
 
         def keys_to_exclude

data/lib/xsdk/scaffold/rails/version.rb

@@ -1,7 +1,7 @@
 module Xsdk
   module Scaffold
     module Rails
-      VERSION = "0.1.10"
+      VERSION = "0.1.11"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xsdk-scaffold-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Davide Croci
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-22 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord