tabulatr2 0.9.38 → 0.9.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fed58d0f324fcdad7814934b71ad0d1d98bb645f1cd3d11556c6cb78e59cd10
-  data.tar.gz: 8490c3dd434a56a6861332d40263c8e09433381b43df97a3487d8ff01c0b6c9b
+  metadata.gz: 2fd922d9e3607591509ce645ab120be41b1684a9186cf3cd3ee8349aa448d4b3
+  data.tar.gz: 9437dec7454741490fb08c3866189ddaa52fd880c383554141d65de70351214e
 SHA512:
-  metadata.gz: 8c815d8cac08355567a8744909fc56de7968b54ab0378cb0726d97b90e71ca7a3563b9c3aa6d0fe40679a86f2ecf738bb6915519338b86dc10857f5e76101d95
-  data.tar.gz: 4b98da8ab572435d9eb1926a6d7489da794c1398d0d601159db912203fb422b7a19c2b4ae09710d2b435b78d9834e7db308b548261e1f890bd9127dd1e519245
+  metadata.gz: 2aacfc00dd329b4182964a50417616822ecd53bab1dc971dc7f3ac0ac8575728c0f5d71124fdd1d84dee973cd580bb99b0948473dfbc7d74ad7c37cf86becb83
+  data.tar.gz: '091abbb6286cb6277814faa00503786c31b775793b82cc2fb1541e7ca4a03d08aefb3bea5684c1b4ca36e53197b7e9b45e4c05c8a994d3c24c944465ea489357'

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

@@ -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/formatting.rb

@@ -24,7 +24,7 @@
 module Tabulatr::Data::Formatting
 
   def apply_formats(locals: {}, controller: nil)
-    view = Data::Proxy.new(locals: locals, controller: controller)
+    view = Tabulatr::Data::Proxy.new(locals: locals, controller: controller)
     return @relation.map do |record|
       view.record = record
       h = HashWithIndifferentAccess.new

data/lib/tabulatr/data/proxy.rb

@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-class Data::Proxy < ActionView::Base
+class Tabulatr::Data::Proxy < ActionView::Base
 
   attr_accessor :record, :controller
 

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.38"
+  VERSION = "0.9.43"
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.9.38
+  version: 0.9.43
 platform: ruby
 authors:
 - Peter Horn
 - Florian Thomas
 - René Sprotte
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2020-07-22 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,9 +279,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A tight DSL to build tables of ActiveRecord models with sorting, pagination,
   finding/filtering, selecting and batch actions.