effective_datatables 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53509b26f9e4b62d154006f3ae6ecd5ac0fe61a4
-  data.tar.gz: 553b9c7616b6ee897aae9b65b7e2871a2cf2ef24
+  metadata.gz: 087d65c39d2b88c60fcc041b5f7a564bc61bded7
+  data.tar.gz: 611af4b47aaa06ccb61d59b5d8cd4bcb56363d91
 SHA512:
-  metadata.gz: 5a219222e02cfe4dfb76c5ce8799ee8cd842ca80e46d41c24185e3b34c19ec03bf79b8fcbcbcd5c1dc469b896f7382ee2822e929101e7c421709083439e27ced
-  data.tar.gz: eeb7adca4ac69be8345c504179bdff6c495d14a4fe4c2189674a9978415884a1689cf7c4a6269b9d236792a8dbd97bfd0171063c57b4823a31955dc963402571
+  metadata.gz: 6ddaca87e620c93d477081bd48fc4e6ba8029fef349ef3042d1b4b4dae736d6603822366d9d7f0741f0ecb5280e91833466ed2fd9a53b520d79b4e5de066d08c
+  data.tar.gz: e2217a2fd7c3b191bbf755a55f46b5ac85ac6ec44d67a6465302590710982660f3ab4f4a3d56661c4f47864c0d1023e49cd3073cce75c59795e345a9df26e840

data/README.md

@@ -133,6 +133,7 @@ module Effective
   module Datatables
     class Posts < Effective::Datatable
       default_order :created_at, :desc
+      default_entries 25
 
       table_column :id, :visible => false
 
@@ -387,6 +388,17 @@ Sort the table by this field and direction on start up
 default_order :created_at, :asc|:desc
 ```
 
+## default_entries
+
+The number of entries to show per page
+
+```ruby
+default_entries :all
+```
+
+Valid options are `10, 25, 50, 100, 250, 1000, :all`
+
+
 ## Additional Functionality
 
 There are a few other ways to customize the behaviour of effective_datatables

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

@@ -18,7 +18,7 @@ initializeDataTables = ->
         sAjaxSource: datatable.data('source')
         pagingType: 'simple_numbers'
         lengthMenu: [[10, 25, 50, 100, 250, 1000, -1], [10, 25, 50, 100, 250, 1000, 'All']]
-        iDisplayLength: 25
+        iDisplayLength: datatable.data('default-entries')
         fnServerParams: (aoData, a, b) ->
           table = this.DataTable()
           table.columns().flatten().each (index) ->  # Pass which columns are visible back to server
@@ -33,6 +33,7 @@ initializeDataTables = ->
                 sSearch = undefined
                 ((sSearch = data; break) if data.name == "sSearch_#{index}") for data in aoData
                 sSearch.value = filter.selected if sSearch
+                datatable.fnSettings().aoPreSearchCols[index].sSearch = filter.selected
 
         aoColumnDefs: aoColumnDefs
         aoColumns: datatable.data('widths')

data/app/helpers/effective_datatables_helper.rb

@@ -58,6 +58,12 @@ module EffectiveDatatablesHelper
     ].to_json()
   end
 
+  def datatable_default_entries(datatable)
+    default_entries = (datatable.default_entries.presence || EffectiveDatatables.default_entries)
+    default_entries = -1 if default_entries.to_s.downcase == 'all'
+    [10, 25, 50, 100, 250, 1000, -1].include?(default_entries) ? default_entries : 25
+  end
+
   def datatable_widths(datatable)
     datatable.table_columns.values.map { |options| {'sWidth' => options[:width]} if options[:width] }.to_json()
   end

data/app/models/effective/datatable.rb

@@ -41,6 +41,10 @@ module Effective
         @default_order = {name => direction}
       end
 
+      def default_entries(entries)
+        @default_entries = entries
+      end
+
     end
 
     def initialize(*args)
@@ -115,6 +119,10 @@ module Effective
       self.class.instance_variable_get(:@default_order)
     end
 
+    def default_entries
+      self.class.instance_variable_get(:@default_entries)
+    end
+
     def search_terms
       @search_terms ||= HashWithIndifferentAccess.new().tap do |terms|
         table_columns.keys.each_with_index do |col, x|

data/app/views/effective/datatables/_datatable.html.haml

@@ -1,4 +1,4 @@
-%table.effective-datatable{:id => "#{datatable.to_param}-table", :class => ('table ' + table_class.to_s), :data => {'effective-datatables-table' => style, 'source' => effective_datatables.datatable_path(datatable, {:format => 'json'}.merge(:attributes => datatable.attributes)), 'filter' => datatable_filter(datatable, filterable), 'non-sortable' => datatable_non_sortable(datatable, sortable), 'non-visible' => datatable_non_visible(datatable), 'widths' => datatable_widths(datatable), 'default-order' => datatable_default_order(datatable), 'column-classes' => datatable_column_classes(datatable)}}
+%table.effective-datatable{:id => "#{datatable.to_param}-table", :class => ('table ' + table_class.to_s), :data => {'effective-datatables-table' => style, 'source' => effective_datatables.datatable_path(datatable, {:format => 'json'}.merge(:attributes => datatable.attributes)), 'filter' => datatable_filter(datatable, filterable), 'non-sortable' => datatable_non_sortable(datatable, sortable), 'non-visible' => datatable_non_visible(datatable), 'widths' => datatable_widths(datatable), 'default-order' => datatable_default_order(datatable), 'default-entries' => datatable_default_entries(datatable), 'column-classes' => datatable_column_classes(datatable)}}
   %thead
     - max_depth = datatable.table_columns.map { |_, opts| opts[:th][:depth].to_i rescue 0 }.max
     - [*0..max_depth].each do |depth|

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '1.2.4'.freeze
+  VERSION = '1.2.5'.freeze
 end

data/lib/effective_datatables.rb

@@ -8,6 +8,7 @@ module EffectiveDatatables
   mattr_accessor :authorization_method
   mattr_accessor :date_format
   mattr_accessor :datetime_format
+  mattr_accessor :default_entries
 
   def self.setup
     yield self

data/lib/generators/templates/effective_datatables.rb

@@ -26,5 +26,7 @@ EffectiveDatatables.setup do |config|
   config.date_format = "%Y-%m-%d"
   config.datetime_format = "%Y-%m-%d %H:%M"
 
-
+  # Default number of entries shown per page
+  # Valid options are: 10, 25, 50, 100, 250, 1000, :all
+  config.default_entries = 25
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails