effective_datatables 3.2.6 → 3.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a60414a14abdc45d87dbda78636a95a3e9a0b7e1
-  data.tar.gz: 5c97dbdd9932315966189a6702591e57406623cc
+  metadata.gz: ef7002186c955ceea81788574da37e926dde317e
+  data.tar.gz: e4bc57451595479713c11d423d2b21b22629eaae
 SHA512:
-  metadata.gz: 5b47935fefc03832d781d6f92e37c4254c54db5b41cc1808f152f8c7668912f71c9afdb59b0a37877eb989628577c52f7caca977f4a090590005d86dd336f1c2
-  data.tar.gz: d77569664a318d3e60b23cbd6533b62ef0049f56e6f11dafef8e9b641bbb7d9c1fb0cde5767aba2739fcae6a3a21f73925d16b9e7d468e448cf987131659aee9
+  metadata.gz: 07f99e9baa2ca960349e3fc42949cc14a679109d5156ec8990b7fca81ee24a5abd582a67b07bc2a476da9eb588fc04660944609065c7fc7eaae470d1ed2ebbe1
+  data.tar.gz: 867adf502935e2db8dec3171e785ee70039d0a15844ebea9a2858584a2f3a27201f5ecd4bf3918ff9c7ef227b7489559f92c0a66965d22ed45cd1a204914a2f9

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

@@ -58,7 +58,7 @@ $(document).on 'click', '.buttons-bulk-actions a', (event) ->
         $processing.html(success)
         $table.dataTable().data('bulk-actions-restore-selected-values', values)
         $table.DataTable().draw()
-      failCallback:  ->
+      failCallback: ->
         error = "An error occured while attempting #{title} bulk action"
         $processing.html(error)
         alert(error)

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

@@ -1,4 +1,4 @@
-$(document).on 'click', 'a[data-apply-datatable-filters]', (event) ->
+$(document).on 'click', 'a[data-apply-effective-datatables-filters]', (event) ->
   event.preventDefault()
   $form = $(event.currentTarget).closest('.effective-datatables-filters')
   $table = $('#' + $form.attr('aria-controls'))

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

@@ -3,9 +3,9 @@ initializeDataTables = ->
     return if $.fn.DataTable.fnIsDataTable(this)
 
     datatable = $(this)
-    simple = ('' + datatable.data('simple') == 'true')
     input_js_options = datatable.data('input-js-options') || {}
     buttons_export_columns = input_js_options['buttons_export_columns'] || ':not(.col-actions)'
+    simple = ('' + datatable.data('simple') == 'true')
 
     if input_js_options['buttons'] == false
       input_js_options['buttons'] = []
@@ -178,7 +178,7 @@ initializeDataTables = ->
 
     if simple
       init_options['dom'] = "<'row'<'col-sm-12'tr>>" # Just show the table
-      datatable.addClass('sort-hidden search-hidden')
+      datatable.addClass('simple')
 
     # Let's actually initialize the table now
     table = datatable.dataTable(jQuery.extend(init_options, input_js_options))

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

@@ -27,28 +27,37 @@ table.dataTable thead > tr > th.sorting {
   padding-right: 18px;
 }
 
-table.dataTable thead tr th {
-  text-align: left;
-  vertical-align: top;
-  border-bottom: none;
-  white-space: nowrap;
-  padding: 6px;
-
-  .form-group { margin-bottom: 0px; font-weight: normal; }
-}
+// Search bar
+table.dataTable thead {
+  tr th {
+    text-align: left;
+    vertical-align: top;
+    border-bottom: none;
+    white-space: nowrap;
+    padding: 6px;
+  }
 
-// Sorting disabled
-table.dataTable.sort-hidden thead .sorting { background-image: none; }
-table.dataTable.sort-hidden thead .sorting_asc { background-image: none; }
-table.dataTable.sort-hidden thead .sorting_desc { background-image: none; }
+  .form-control, .form-group {
+    width: 100%;
+    font-weight: normal;
+    margin-left: 0px;
+    margin-right: 0px;
+  }
 
-table.dataTable.search-hidden thead .form-group { display: none; }
+  .datatable_search__bulk_actions { margin-left: 5px; }
+}
+
+// Simple styles
+table.dataTable.simple {
+  thead {
+    .sorting { background-image: none; cursor: default; }
+    .sorting_asc { background-image: none; cursor: default; }
+    .sorting_desc { background-image: none; cursor: default; }
 
-// Filter bar
-table.dataTable .form-group { width: 100%; margin-left: 0px; margin-right: 0px; }
-table.dataTable select { width: 100%; }
-table.dataTable .form-control { width: 100%;  }
-table.dataTable .form-group.datatable_search_bulk_actions { margin-left: 4px; }
+    .form-group { display: none; }
+    .col-bulk_actions { display: none; }
+  }
+}
 
 // Processing popup
 div.dataTables_wrapper div.dataTables_processing {
@@ -61,7 +70,6 @@ div.dataTables_wrapper div.dataTables_processing {
 
 // Show x per page
 .dataTables_wrapper div.dataTables_length {
-  margin-bottom: 4px;
   color: #909090;
   font-size: 12px;
 }
@@ -135,7 +143,7 @@ ul.dt-button-collection {
 div.dataTables_wrapper div.dataTables_info {
   color: #909090;
   font-size: 12px;
-  padding: 5px 0px 0px 6px;
+  padding: 5px 0px 6px 6px;
 }
 
 // Collapsed responsive view
@@ -144,7 +152,7 @@ table.dataTable > tbody > tr.child span.dtr-data { white-space: nowrap; }
 
 table.dataTable.dtr-inline.collapsed > tbody > tr:not(.child) > td:first-child,
 table.dataTable.dtr-inline.collapsed > tbody > tr:not(.child) > th:first-child {
- padding-left: 30px !important;
+  padding-left: 30px !important;
 }
 
 // Column specific adjustments

data/app/helpers/effective_datatables_helper.rb

@@ -1,7 +1,7 @@
 # These are expected to be called by a developer.  They are part of the datatables DSL.
 module EffectiveDatatablesHelper
 
-  def render_datatable(datatable, input_js: {}, charts: true, filters: true, simple: false, buttons: true)
+  def render_datatable(datatable, input_js: {}, buttons: true, charts: true, filters: true, simple: false)
     raise 'expected datatable to be present' unless datatable
 
     datatable.view ||= self
@@ -14,7 +14,9 @@ module EffectiveDatatablesHelper
 
     charts = charts && datatable._charts.present?
     filters = filters && (datatable._scopes.present? || datatable._filters.present?)
-    input_js[:buttons] = false unless buttons
+
+    datatable.attributes[:simple] = true if simple
+    input_js[:buttons] = false if simple || !buttons
 
     effective_datatable_params = {
       id: datatable.to_param,
@@ -53,8 +55,6 @@ module EffectiveDatatablesHelper
 
       output
     else
-      datatable.attributes[:simple] = true if simple
-
       render(partial: 'effective/datatables/datatable',
         locals: { datatable: datatable, effective_datatable_params: effective_datatable_params }
       )

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

@@ -57,12 +57,12 @@ module Effective
             case opts[:as]
             when *resource.macros
               opts[:resource] ||= Effective::Resource.new(resource.associated(name), namespace: controller_namespace)
-              (opts[:sql_column] = name) if opts[:sql_column].nil?
+              opts[:sql_column] = name if opts[:sql_column].nil?
             when Class
               if opts[:as].ancestors.include?(ActiveRecord::Base)
                 opts[:resource] = Effective::Resource.new(opts[:as], namespace: controller_namespace)
                 opts[:as] = :resource
-                (opts[:sql_column] = name) if opts[:sql_column].nil?
+                opts[:sql_column] = name if opts[:sql_column].nil?
               end
             when :effective_addresses
               opts[:resource] = Effective::Resource.new(resource.associated(name), namespace: controller_namespace)
@@ -71,9 +71,7 @@ module Effective
               opts[:sql_column] = :effective_roles
             when :string  # This is the fallback
               # Anything that doesn't belong to the model or the sql table, we assume is a SELECT SUM|AVG|RANK() as fancy
-              if (resource.table && resource.column(name).blank?)
-                opts[:sql_as_column] = true
-              end
+              opts[:sql_as_column] = true if (resource.table && resource.column(name).blank?)
             end
           end
         end

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

@@ -24,4 +24,4 @@
         - if datatable._filters_form_required?
           = form.button :submit, 'Apply', 'data-disable-with': 'Applying...'
         - else
-          = link_to 'Apply', '#', class: 'btn btn-primary btn-sm btn-effective-datatables-filters', 'data-apply-datatable-filters': true
+          = link_to 'Apply', '#', class: 'btn btn-primary btn-sm btn-effective-datatables-filters', 'data-apply-effective-datatables-filters': true

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.2.6'.freeze
+  VERSION = '3.2.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.2.6
+  version: 3.2.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2017-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails