table_on_steroids 0.1.1.4 → 0.1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2547a1c4fc6fc859a3ddb7615fb98aca6283f4b3
-  data.tar.gz: 66366e0985833410b6640f15cc7834c1dbc5571d
+SHA256:
+  metadata.gz: 7d2770c294afbaf743ff369c3e9a933e17ccb338c72b6f54882221d2c5747798
+  data.tar.gz: 1d277ff42c505cd979cb3abf64410257b29d84cb5c58c5dfd9b561deeb8c9527
 SHA512:
-  metadata.gz: 637e8e41931f9c3e3385a47b16019d10e3d211081cc9a33d0cb32648cb1337a9ce7f68fe22e2efa4429dcf2e621c567035c42c70183fd22c73f4233305164942
-  data.tar.gz: b85d41dc5f8f1d8b6d4dd888a83ef5fb66920baa644d8de837867749c6b84502ac98e4c8d0ff9d33e3780756e51c456659ebe57fecdea63d7a7b2fc1c3c82146
+  metadata.gz: ead00f19adf88d70a2addd2c16a863aabab9c5f5aceff2ad8152536fbaaf87c31a96a489ad58b000226b0439fc34885e6a8eb57475fe9a8187915bdfc06dbabc
+  data.tar.gz: a04166b1d09e162e881628b0ac6a3d959301dea94234a1ba7e9257919518ac6a7ba2b24c2b5c4bffb65e95ac96c39957ba1490f3b98804372459d1c8d07abc5b

data/README.md

@@ -63,10 +63,12 @@ options:
         - filter_lambda
         - order_lambda
         - search_lambda
+        - default_order (true|false)
  - activerecord : activerecord lambdas for search and order
         - filter_lambda
         - order_lambda
         - search_lambda
+        - default_order (true|false)
 
 
 ```

data/app/controllers/concerns/table_on_steroids/table_concern.rb

@@ -64,8 +64,11 @@ module TableOnSteroids
             objects = objects.reorder(nil) if(objects.is_a?(ActiveRecord::Base) || objects.is_a?(ActiveRecord::Relation))
             objects = object_order[t][:order_lambda].call(objects)
           end
-        elsif(object_order = columns_on_steroid.select{ |c,v| v[:default_order]}.collect{ |c,v| v[:order_lambda] }).present?
-          objects = object_order.call(objects)
+      elsif  ( object_order = columns_on_steroid.select{ |c,v| v[t] && v[t][:default_order] }.first&.last).present?
+          if(object_order[t] && object_order[t][:order_lambda])  
+            objects = objects.reorder(nil) if(objects.is_a?(ActiveRecord::Base) || objects.is_a?(ActiveRecord::Relation))
+            objects = object_order[t][:order_lambda].call(objects)
+          end
         elsif(objects.is_a?(ActiveRecord::Base) || objects.is_a?(ActiveRecord::Relation))
           #objects = objects.order('created_at desc')
         end

data/lib/table_on_steroids/version.rb

@@ -1,3 +1,3 @@
 module TableOnSteroids
-  VERSION = '0.1.1.4'
+  VERSION = '0.1.1.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table_on_steroids
 version: !ruby/object:Gem::Version
-  version: 0.1.1.4
+  version: 0.1.1.5
 platform: ruby
 authors:
 - Marieke Gueye
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-31 00:00:00.000000000 Z
+date: 2019-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-datepicker-rails
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Create awesome tables for rails