effective_datatables 2.6.8 → 2.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44d18b34dca0688f3e8e2ec25d2ed592f00ba43d
-  data.tar.gz: a6383ebab0bc9427a63e3ad748ec0c7d56667a6f
+  metadata.gz: bfcfa607598e145978051831be4699b22abada93
+  data.tar.gz: 7400ddc7374fa28e61c06f620d82780de069be75
 SHA512:
-  metadata.gz: 6befe569f7efeb2b855acaadcad8af346a14ed401c5fd89c0405f34e8e07e71650a578062ca596474fc54780c8032cc30205d8d845289379402d2d4d97b8f65f
-  data.tar.gz: a94df95c8e87b9e80ed522b84dd98843a7a14737896daf880120b5ed797269b48d784d721142bbbb8bfcc7febe078b55e81f86e6270ad1f977136a050fc1c48f
+  metadata.gz: 008e48a5a8bb112d32a7b5c64df8c381d099371588af74321ff0ce30aae6ad9b95c14dbdb659b95469bdc9668a91d8bc217d27b44e8f3fcf6b5bda2e7cb0ed4b
+  data.tar.gz: c9dcca53071f78e3ab100e69f82d675be3bcce35bd9c97b586161dce402823fed45c856433c247419df061af9cece2c1057b8affc7b89ee2770674285086ca29

data/app/assets/javascripts/effective_datatables/initialize.js.coffee

@@ -146,6 +146,8 @@ initializeDataTables = ->
 
     # Do the actual search
     dataTableSearch = ($input) ->   # This is the function called by a select or input to run the search
+      return if $input.is(':invalid')
+
       table = $input.closest('table.dataTable')
       table.DataTable().column("#{$input.data('column-name')}:name").search($input.val()).draw()
 

data/app/assets/stylesheets/effective_datatables/_overrides.scss.erb

@@ -156,6 +156,10 @@ table.dataTable.dtr-inline.collapsed > tbody > tr:not(.child) > th:first-child {
 table.dataTable tbody {
   td.col-price { text-align: right; }
 
+  td.col-actions {
+    white-space: nowrap;
+  }
+
   td.col-bulk_actions {
     input[type='checkbox'] { margin-left: 3px; }
   }

data/app/controllers/effective/datatables_controller.rb

@@ -40,6 +40,8 @@ module Effective
         :data => [],
         :recordsTotal => 0,
         :recordsFiltered => 0,
+        :aggregates => [],
+        :charts => {}
       }.to_json
     end
 

data/app/helpers/effective_datatables_helper.rb

@@ -89,27 +89,37 @@ module EffectiveDatatablesHelper
     return render(partial: opts[:header_partial], locals: {form: form, name: (opts[:label] || name), column: opts}) if opts[:header_partial].present?
 
     include_blank = opts[:filter].key?(:include_blank) ? opts[:filter][:include_blank] : (opts[:label] || name.titleize)
+    pattern = opts[:filter].key?(:pattern) ? opts[:filter][:pattern] : nil
     placeholder = opts[:filter].key?(:placeholder) ? opts[:filter][:placeholder] : (opts[:label] || name.titleize)
+    title = opts[:filter].key?(:title) ? opts[:filter][:title] : (opts[:label] || name.titleize)
 
     case opts[:filter][:as]
     when :string, :text, :number
       form.input name, label: false, required: false, value: value,
         as: :string,
         placeholder: placeholder,
-        input_html: { name: nil, value: value, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} }
+        input_html: { name: nil, value: value, title: title, pattern: pattern, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} }
+    when :obfuscated_id
+      pattern ||= "[0-9]{3}-?[0-9]{4}-?[0-9]{3}"
+      title = opts[:filter].key?(:title) ? opts[:filter][:title] : "Expected format: XXX-XXXX-XXX"
+
+      form.input name, label: false, required: false, value: value,
+        as: :string,
+        placeholder: placeholder,
+        input_html: { name: nil, value: value, title: title, pattern: pattern, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} }
     when :date
       form.input name, label: false, required: false, value: value,
         as: (ActionView::Helpers::FormBuilder.instance_methods.include?(:effective_date_picker) ? :effective_date_picker : :string),
         placeholder: placeholder,
         input_group: false,
-        input_html: { name: nil, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
+        input_html: { name: nil, value: value, title: title, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
         input_js: { useStrict: true, keepInvalid: true }
     when :datetime
       form.input name, label: false, required: false, value: value,
         as: (ActionView::Helpers::FormBuilder.instance_methods.include?(:effective_date_time_picker) ? :effective_date_time_picker : :string),
         placeholder: placeholder,
         input_group: false,
-        input_html: { name: nil, value: value, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
+        input_html: { name: nil, value: value, title: title, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
         input_js: { useStrict: true, keepInvalid: true } # Keep invalid format like "2015-11" so we can still filter by year, month or day
     when :select, :boolean
       form.input name, label: false, required: false, value: value,
@@ -118,7 +128,7 @@ module EffectiveDatatablesHelper
         selected: opts[:filter][:selected],
         multiple: opts[:filter][:multiple] == true,
         include_blank: include_blank,
-        input_html: { name: nil, value: value, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
+        input_html: { name: nil, value: value, title: title, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
         input_js: { placeholder: placeholder }
     when :grouped_select
       form.input name, label: false, required: false, value: value,
@@ -131,7 +141,7 @@ module EffectiveDatatablesHelper
         polymorphic: opts[:filter][:polymorphic] == true,
         group_label_method: opts[:filter][:group_label_method] || :first,
         group_method: opts[:filter][:group_method] || :last,
-        input_html: { name: nil, value: value, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
+        input_html: { name: nil, value: value, title: title, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
         input_js: { placeholder: placeholder }
     when :bulk_actions_column
       form.input name, label: false, required: false, value: nil,

data/app/models/effective/effective_datatable/ajax.rb

@@ -10,16 +10,20 @@ module Effective
       def display_table_columns
         return nil if params[:columns].blank?
 
-        @display_table_columns ||= params[:columns].each_with_object({}) do |(_, column), retval|
-          retval[column[:name]] = table_columns[column[:name]] # Same order as ColReordernow
-          retval[column[:name]][:visible] = (column[:visible] == 'true') # As per ColVis
-        end
+        @display_table_columns ||= (
+          {}.tap do |retval|
+            params[:columns].each do |_, column|
+              retval[column[:name]] = table_columns[column[:name]] # Same order as ColReordernow
+              retval[column[:name]][:visible] = (column[:visible] == 'true') # As per ColVis
+            end
+          end
+        )
       end
 
       def order_name
         @order_name ||= begin
           if params[:order] && params[:columns]
-            order_by_column_index = (params[:order].first[1][:column] rescue '0')
+            order_by_column_index = (params[:order]['0'][:column] rescue '0')
             (params[:columns][order_by_column_index] || {})[:name]
           elsif @default_order.present?
             @default_order.keys.first
@@ -33,7 +37,7 @@ module Effective
 
       def order_direction
         @order_direction ||= if params[:order].present?
-          params[:order].first[1][:dir] == 'desc' ? :desc : :asc
+          params[:order]['0'][:dir] == 'desc' ? :desc : :asc
         elsif @default_order.present?
           @default_order.values.first.to_s.downcase == 'desc' ? :desc : :asc
         else

data/app/models/effective/effective_datatable/options.rb

@@ -114,8 +114,12 @@ module Effective
               :has_and_belongs_to_many
             elsif cols[name][:bulk_actions_column]
               :bulk_actions_column
-            elsif name.include?('_address') && (collection_class.new rescue nil).respond_to?(:effective_addresses)
+            elsif name.include?('_address') && defined?(EffectiveAddresses) && (collection_class.new rescue nil).respond_to?(:effective_addresses)
               :effective_address
+            elsif name == 'id' && defined?(EffectiveObfuscation) && collection.respond_to?(:deobfuscate)
+              :obfuscated_id
+            elsif name == 'roles' && defined?(EffectiveRoles) && collection.respond_to?(:with_role)
+              :effective_roles
             elsif sql_column.try(:type).present?
               sql_column.type
             elsif name.end_with?('_id')
@@ -132,22 +136,14 @@ module Effective
             cols[name][:format] = :non_formatted_integer
           end
 
-          # We can't really sort a HasMany or EffectiveAddress field
-          if [:has_many, :effective_address].include?(cols[name][:type])
+          # Sortable - Disable sorting on these types
+          if [:has_many, :effective_address, :obfuscated_id].include?(cols[name][:type])
             cols[name][:sortable] = false
           end
 
-          # EffectiveObfuscation
-          if name == 'id' && defined?(EffectiveObfuscation) && collection.respond_to?(:deobfuscate)
-            cols[name][:sortable] = false
-            cols[name][:type] = :obfuscated_id
-          end
-
           # EffectiveRoles, if you do table_column :roles, everything just works
-          if name == 'roles' && defined?(EffectiveRoles) && collection.respond_to?(:with_role)
-            cols[name][:sortable] = true
+          if cols[name][:type] == :effective_roles
             cols[name][:column] = sql_table.present? ? "#{quote_sql(sql_table.name)}.#{quote_sql('roles_mask')}" : name
-            cols[name][:type] = :effective_roles
           end
 
           if sql_table.present? && sql_column.blank? # This is a SELECT AS column, or a JOIN column
@@ -256,6 +252,8 @@ module Effective
           {as: :string}
         when :effective_roles
           {as: :select, collection: EffectiveRoles.roles}
+        when :obfuscated_id
+          {as: :obfuscated_id}
         when :integer
           {as: :number}
         when :boolean

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.6.8'.freeze
+  VERSION = '2.6.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.6.8
+  version: 2.6.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails