effective_datatables 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: accdc49e5adcbb84639c6f04e26a080544bd8f4b
-  data.tar.gz: 763d0016579e806d0d77b54a62caedcbf049b6df
+  metadata.gz: 0a1f1f2a6e87aaf8bf7f99ba7cd7d44e4e6caac9
+  data.tar.gz: 6841c6589deca99298224940312ab6dfe0c4a91d
 SHA512:
-  metadata.gz: 63c01f326d91d3eac11bf530291e193f44e96b418ad2162e54a636b0cba91b4911b751c3389221841470a79ba382f4662a799fc6c133769642fe915088c3e8e4
-  data.tar.gz: 1690d18d9e6656b9ddf3dfdeb4351203355fc6c188434dcfde87a0cc7d0d7de5a1a7690f97ec1198f3fb89dc426b00a9a0b7cf49e8cb3f3c7cc0850a3fe7af3d
+  metadata.gz: 27b16423b467f54c659d117251a8808208f0ec0524a419f9d5896cfaa1b976cbe22e480731e1f86129d09adf507212ce58c407a9f1bdcde688e7adfb83bbdb26
+  data.tar.gz: c05df8edff215a2a211c19a0b008294c553c324f77e1427d97e2d3585e1a9d68f35d9993621812838aff423aed33b1fff7c3cabfa5cccef34ea45b5a73e847f6

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

@@ -154,3 +154,7 @@ div.dataTables_wrapper div.dataTables_info {
     }
   }
 }
+
+// Collapsed responsive view
+table.dataTable > tbody > tr.child span.dtr-title { min-width: 175px; }
+table.dataTable > tbody > tr.child span.dtr-data { white-space: nowrap; }

data/app/helpers/effective_datatables_helper.rb

@@ -19,7 +19,7 @@ module EffectiveDatatablesHelper
   # https://datatables.net/reference/option/columns
   def datatable_columns(datatable)
     form = nil
-    simple_form_for(datatable, url: '#', html: {id: "#{datatable.to_param}-form"}) { |f| form = f }
+    simple_form_for(:datatable_filter, url: '#', html: {id: "#{datatable.to_param}-form"}) { |f| form = f }
 
     datatable.table_columns.map do |name, options|
       {
@@ -30,44 +30,45 @@ module EffectiveDatatablesHelper
         responsivePriority: (options[:responsivePriority] || 10000),  # 10,000 is datatables default
         sortable: (options[:sortable] && !datatable.simple?),
         visible: (options[:visible].respond_to?(:call) ? datatable.instance_exec(&options[:visible]) : options[:visible]),
-        filterHtml: (datatable_header_filter(form, name, options) unless datatable.simple?),
+        filterHtml: (datatable_header_filter(form, name, datatable.search_terms[name], options) unless datatable.simple?),
         filterSelectedValue: options[:filter][:selected]
       }
     end.to_json()
   end
 
-  def datatable_header_filter(form, name, opts)
+  def datatable_header_filter(form, name, value, opts)
     return render(partial: opts[:header_partial], locals: {form: form, name: (opts[:label] || name), column: opts}) if opts[:header_partial].present?
 
     case opts[:filter][:type]
     when :string, :text, :number
-      form.input name, label: false, required: false, as: :string, placeholder: (opts[:label] || name),
-        input_html: { name: nil, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} }
-
+      form.input name, label: false, required: false, value: value,
+        as: :string,
+        placeholder: (opts[:label] || name),
+        input_html: { name: nil, value: value, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} }
     when :date
-      form.input name, label: false, required: false,
+      form.input name, label: false, required: false, value: value,
         as: (defined?(EffectiveFormInputs) ? :effective_date_picker : :string),
         placeholder: (opts[:label] || name),
         input_group: false,
         input_html: { name: nil, 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,
+      form.input name, label: false, required: false, value: value,
         as: (defined?(EffectiveFormInputs) ? :effective_date_time_picker : :string),
         placeholder: (opts[:label] || name),
         input_group: false,
-        input_html: { name: nil, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
+        input_html: { name: nil, value: value, 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,
+      form.input name, label: false, required: false, value: value,
         as: (defined?(EffectiveFormInputs) ? :effective_select : :select),
         collection: opts[:filter][:values],
         multiple: opts[:filter][:multiple] == true,
         include_blank: (opts[:label] || name.titleize),
-        input_html: { name: nil, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
+        input_html: { name: nil, value: value, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
         input_js: { placeholder: (opts[:label] || name.titleize) }
     when :grouped_select
-      form.input name, label: false, required: false,
+      form.input name, label: false, required: false, value: value,
         as: (defined?(EffectiveFormInputs) ? :effective_select : :grouped_select),
         collection: opts[:filter][:values],
         multiple: opts[:filter][:multiple] == true,
@@ -76,7 +77,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, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
+        input_html: { name: nil, value: value, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
         input_js: { placeholder: (opts[:label] || name.titleize) }
     end
   end

data/app/models/effective/datatable.rb

@@ -30,9 +30,6 @@ module Effective
       if @default_order.present? && !table_columns.key?((@default_order.keys.first rescue nil))
         raise "default_order :#{(@default_order.keys.first rescue 'nil')} must exist as a table_column or array_column"
       end
-
-      # Any pre-selected search terms should be assigned now
-      search_terms.each { |column, term| self.send("#{column}=", term) }
     end
 
     def table_columns
@@ -142,11 +139,11 @@ module Effective
     end
 
     def table_tool
-      @table_tool ||= ActiveRecordDatatableTool.new(self, table_columns.select { |_, col| col[:array_column] == false })
+      @table_tool ||= ActiveRecordDatatableTool.new(self, table_columns.reject { |_, col| col[:array_column] })
     end
 
     def array_tool
-      @array_tool ||= ArrayDatatableTool.new(self, table_columns.select { |_, col| col[:array_column] == true })
+      @array_tool ||= ArrayDatatableTool.new(self, table_columns.select { |_, col| col[:array_column] })
     end
 
     def active_record_collection?

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

@@ -27,7 +27,6 @@ module Effective
         end
         raise "You cannot use both partial: ... and proc: ..." if options[:partial] && options[:proc]
 
-        self.class.send(:attr_accessor, name)
         (@table_columns ||= HashWithIndifferentAccess.new())[name] = options
       end
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.2.3'.freeze
+  VERSION = '2.2.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails