tabulatr2 0.9.39 → 0.9.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1706d3a41110804765176f50317e42e25df7a08f8c0834591ea042b72ab2366f
-  data.tar.gz: ec5fb3df2608a5997e81366c3cc8bbe0694703a49d38e130de6ae69ba3905304
+  metadata.gz: da21cb12d7978ecea6910cfd2f8b7bb11c29460188ef9f74b67ff39254bcf09d
+  data.tar.gz: 8180c80ce2a939080bd265de2cb917627b90bcdb981b39663e9e05f43c3c952c
 SHA512:
-  metadata.gz: d77e36296a6aa444ae874dfe67748db7fcbe57bfc1ebd2f2db4629f7c4a65d501aa89c0ac62888dd2c621701983ee5119893107ad89e8fa0f2580387dacafc4e
-  data.tar.gz: 9d2ecd814d67f2bb64d59492f3460ff0a959fcf5326c9de4df32e6c6e7b20026b40e676115d9069e6be6fbb42a196906ca2b13ad97466b404b82e70bb2a0018a
+  metadata.gz: 23097f23fac288be8147a1683f0a86a09f84945ef0c740746e5f673adf485acc906442171c4101af75212bd141c722187deb3b6603f3ea80141482334b3a25c8
+  data.tar.gz: 6e759668be381e68306ecdfe6b4a5216d6b3fdc7471894237e2f6536a4dbaf3fd30073d3f329cc2fac16d5ba1fbe581ad6b02a6a0057869d0384a668af5d4454

data/app/assets/javascripts/tabulatr/_events.js

@@ -86,6 +86,10 @@ function tabulatrInitialize() {
     $(this).parents('form.tabulatr_filter_form').submit();
   });
 
+  $('form.tabulatr_filter_form input').on('dp.change', function(){
+    $(this).parents('form.tabulatr_filter_form').submit();
+  });
+
   $('form.tabulatr_filter_form').submit(function(){
     var tableId = $(this).data('table');
     var table_obj;

data/lib/tabulatr/data/data.rb

@@ -89,7 +89,7 @@ class Tabulatr::Data
   def execute_batch_actions batch_param, selected_ids
     if batch_param.present? && @batch_actions.present?
       batch_param = batch_param.keys.first.to_sym if batch_param.is_a?(Hash)
-      selected_ids = @relation.map(&:id) if selected_ids.empty?
+      # selected_ids = @relation.map(&:id) if selected_ids.empty?
       @batch_actions.yield(Invoker.new(batch_param, selected_ids))
     end
   end
@@ -110,10 +110,10 @@ class Tabulatr::Data
   # Params
   #++
 
-  def filter_params(params) params["#{Tabulatr::Utility.formatted_name(@base.name)}_filter"] end
-  def search_param(params)  params["#{Tabulatr::Utility.formatted_name(@base.name)}_search"] end
-  def sort_params(params)   params["#{Tabulatr::Utility.formatted_name(@base.name)}_sort"] end
-  def batch_params(params)  params["#{Tabulatr::Utility.formatted_name(@base.name)}_batch"] end
+  def filter_params(params) params["#{Tabulatr::Utility.formatted_name(@base.name)}_filter"] || params["filter"] end
+  def search_param(params)  params["#{Tabulatr::Utility.formatted_name(@base.name)}_search"] || params["search"] end
+  def sort_params(params)   params["#{Tabulatr::Utility.formatted_name(@base.name)}_sort"]   || params["sort"] end
+  def batch_params(params)  params["#{Tabulatr::Utility.formatted_name(@base.name)}_batch"]  || params["batch"] end
   def check_params(params)
     tabulatr_checked = params["tabulatr_checked"]
     if tabulatr_checked.present?

data/lib/tabulatr/data/sorting.rb

@@ -41,9 +41,13 @@ module Tabulatr::Data::Sorting
       end
       sort_by(column, orientation)
     elsif @default_order.present?
-      @relation = @relation.reorder(@default_order)
+      if @default_order.is_a? String
+        @relation = @relation.reorder(Arel.sql @default_order)
+      else
+        @relation = @relation.reorder(@default_order)
+      end
     else
-      @relation = @relation.reorder("#{@table_name}.#{@base.primary_key} desc")
+      @relation = @relation.reorder(Arel.sql "#{@table_name}.#{@base.primary_key} desc")
     end
   end
 
@@ -52,7 +56,7 @@ module Tabulatr::Data::Sorting
       if sort_sql.respond_to? :call
         @relation = sort_sql.call(@relation, orientation, "#{@table_name}.#{@base.primary_key}", @base)
       else
-        @relation = @relation.reorder("#{sort_sql} #{orientation}")
+        @relation = @relation.reorder(Arel.sql "#{sort_sql} #{orientation}, #{@table_name}.id desc")
       end
   end
 

data/lib/tabulatr/renderer/column.rb

@@ -108,6 +108,19 @@ class Tabulatr::Renderer::Column
     end
   end
 
+  def to_json
+    {
+      name:        "#{table_name}:#{name}",
+      # name:        name,
+      header:      human_name,
+      # klassname:   klassname,
+      # table_name:  table_name,
+      filter:      col_options.filter,
+      sortable:    col_options.sortable,
+      data_html:   col_options.data_html,
+      header_html: col_options.header_html,
+    }
+  end
 
   private
 

data/lib/tabulatr/renderer/renderer.rb

@@ -99,6 +99,10 @@ class Tabulatr::Renderer
     new(klass, view, toptions).build_table(columns, filters, tabulatr_data_class, &block)
   end
 
+  def columns_json(tabulatr_data_class_name=nil)
+    get_data_class(tabulatr_data_class_name).table_columns.map(&:to_json)
+  end
+
   private
 
   def get_requested_columns(available_columns, requested_columns)

data/lib/tabulatr/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module Tabulatr
-  VERSION = "0.9.39"
+  VERSION = "0.9.44"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.9.39
+  version: 0.9.44
 platform: ruby
 authors:
 - Peter Horn
 - Florian Thomas
 - René Sprotte
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-29 00:00:00.000000000 Z
+date: 2021-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -263,7 +263,7 @@ homepage: http://github.com/metaminded/tabulatr2
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -279,8 +279,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: A tight DSL to build tables of ActiveRecord models with sorting, pagination,
   finding/filtering, selecting and batch actions.