tabulatr2 0.9.20 → 0.9.21

data/app/assets/javascripts/tabulatr/_tabulatr.js

@@ -9,6 +9,8 @@ function Tabulatr(id){
   this.hasInfiniteScrolling = false;
 }
 
+var tabulatr_tables;
+
 var cbfn = function(event, isInView, visiblePartX, visiblePartY) {
   if (isInView && visiblePartY !== 'top' && visiblePartY !== 'bottom') {
     var tableId = $(event.currentTarget).data('table');
@@ -22,106 +24,41 @@ var cbfn = function(event, isInView, visiblePartX, visiblePartY) {
   }
 };
 
-var tabulatr_tables;
 Tabulatr.prototype = {
   constructor: Tabulatr,
 
-  createPaginationListItem: function(page, active){
-    var $page = $('<li><a href="" data-page="'+ page +'">'+ page +'</a></li>');
-    if(active){
-      $page.addClass('active');
-    }
-    return $page;
+  updateTable: function(hash, forceReload) {
+    var $table = $('#'+ this.id);
+    this.storePage = this.pageShouldBeStored(hash.page, forceReload);
+    if((this.storePage && this.retrievePage($table, hash)) || this.locked){ return; }
+    this.locked = true;
+    this.showLoadingSpinner();
+    this.loadDataFromServer(hash);
   },
 
-  updatePagination: function(currentPage, numPages){
-    var $paginatorUl = $('.pagination[data-table='+ this.id +'] > ul');
-
-    if($('table#'+ this.id).data('persistent')){
-      $paginatorUl.html('<li><a href="#" data-tabulatr-reset="'+ this.id +'"><i class="fa fa-refresh"></i></a></li>');
-    }else{
-      $paginatorUl.html('');
-    }
-    if(numPages < 13){
-      for(var i = 1; i <= numPages; i++){
-        $paginatorUl.append(this.createPaginationListItem(i, (i == currentPage)));
-      }
-    }else{
-      if(currentPage > 1){
-        $paginatorUl.append(this.createPaginationListItem(1, false));
-      }
-
-      var between = Math.floor((1 + currentPage) / 2);
-      if(between > 1 && between < currentPage - 2){
-        $paginatorUl.append('<li><span>...</span></li>');
-        $paginatorUl.append(this.createPaginationListItem(between, false));
-      }
-
-      if(currentPage > 4){
-        $paginatorUl.append('<li><span>...</span></li>');
-      }
-
-      if(currentPage > 3){
-        $paginatorUl.append(this.createPaginationListItem(currentPage-2, false));
-      }
-
-      if(currentPage > 2){
-        $paginatorUl.append(this.createPaginationListItem(currentPage-1, false));
-      }
-
-      $paginatorUl.append(this.createPaginationListItem(currentPage, true));
-
-      if(currentPage < numPages - 1){
-        $paginatorUl.append(this.createPaginationListItem(currentPage+1, false));
-      }
-
-      if(currentPage < numPages - 2){
-        $paginatorUl.append(this.createPaginationListItem(currentPage+2, false));
-      }
-
-      if(currentPage < numPages - 3){
-        $paginatorUl.append('<li><span>...</span></li>');
-      }
+  pageShouldBeStored: function(page, forceReload){
+    return page !== undefined && !forceReload;
+  },
 
-      between = Math.floor((currentPage + numPages) / 2);
+  retrievePage: function(table, hash){
+    table.find('tbody tr').hide();
+    if(table.find('tbody tr[data-page='+ hash.page +']').length > 0){
+      table.find('tbody tr[data-page='+ hash.page +']').show();
 
-      if(between > currentPage + 3 && between < numPages - 1){
-        $paginatorUl.append(this.createPaginationListItem(between, false));
-        $paginatorUl.append('<li><span>...</span></li>');
-      }
-      if(currentPage < numPages){
-        $paginatorUl.append(this.createPaginationListItem(numPages, false));
+      var tabulatrPagination = new TabulatrPagination(
+        $('.pagination[data-table='+ this.id +'] a:last').data('page'), this.id);
+      tabulatrPagination.updatePagination(hash.page);
+      if(this.isAPersistedTable){
+        var data = this.createParameterString(hash, this.id);
+        localStorage[this.id] = JSON.stringify(data);
       }
+      return true;
     }
-
+    return false;
   },
 
-  updateTable: function(hash, forceReload) {
-    var $table = $('#'+ this.id);
+  getDataForAjax: function(hash){
     var data;
-    if(hash.page !== undefined && !forceReload){
-      //old page should be stored
-      this.storePage = true;
-      // check if this page was already loaded
-      $table.find('tbody tr').hide();
-      if($table.find('tbody tr[data-page='+ hash.page +']').length > 0){
-        $table.find('tbody tr[data-page='+ hash.page +']').show();
-
-        this.updatePagination(hash.page,
-          $('.pagination[data-table='+ this.id +'] a:last').data('page'),
-          this.id);
-        if(this.isAPersistedTable){
-          data = this.createParameterString(hash, this.id);
-          localStorage[this.id] = JSON.stringify(data);
-        }
-        return;
-      }
-    }else{
-      this.storePage = false;
-    }
-    if(this.locked){ return; }
-    this.locked = true;
-    this.showLoadingSpinner();
     if(this.initialRequest && this.isAPersistedTable && localStorage[this.id]){
       data = JSON.parse(localStorage[this.id]);
     }else{
@@ -130,6 +67,10 @@ Tabulatr.prototype = {
         localStorage[this.id] = JSON.stringify(data);
       }
     }
+    return data;
+  },
+
+  loadDataFromServer: function(hash){
     $.ajax({
       context: this,
       type: 'GET',
@@ -137,7 +78,7 @@ Tabulatr.prototype = {
       accepts: {
         json: 'application/json'
       },
-      data: data,
+      data: this.getDataForAjax(hash),
       success: this.handleResponse,
       complete: this.hideLoadingSpinner,
       error: this.handleError
@@ -154,7 +95,9 @@ Tabulatr.prototype = {
 
   handleResponse: function(response) {
     this.insertTabulatrData(response);
-    this.updatePagination(response.meta.page, response.meta.pages, response.meta.table_id);
+    var tabulatrPagination = new TabulatrPagination(
+      response.meta.pages, response.meta.table_id);
+    tabulatrPagination.updatePagination(response.meta.page);
     if($('.pagination[data-table='+ response.meta.table_id +']').length > 0){
       if(response.meta.page > response.meta.pages){
         this.updateTable({page: response.meta.pages});
@@ -217,7 +160,7 @@ Tabulatr.prototype = {
 
   makeAction: function(action, data){
     this.currentData = data;
-    return unescape(action).replace(/{{([\w:]+)}}/g, this.replacer);
+    return decodeURI(action).replace(/{{([\w:]+)}}/g, this.replacer);
   },
 
   submitFilterForm: function(){
@@ -232,40 +175,15 @@ Tabulatr.prototype = {
   createParameterString: function(hash){
     var tableName = this.id.split('_')[0];
     if(hash === undefined){
-      hash = {};
-      hash.append = false;
-    }
-    var pagesize = hash.pagesize;
-    if(pagesize === undefined){
-      pagesize = $('table#'+ this.id).data('pagesize');
+      hash = {append: false};
     }
-    if(hash.page === undefined){
-      if(this.hasInfiniteScrolling){
-        hash.page = Math.floor($('#'+ this.id +' tbody tr[class!=empty_row]').length/pagesize) + 1;
-      }
-      if(!isFinite(hash.page)){
-        hash.page = 1;
-      }
-    }
-    hash.pagesize = pagesize;
+    hash = this.getPageParams(hash);
     hash.arguments = $.map($('#'+ this.id +' th'), function(n){
       return $(n).data('tabulatr-column-name');
     }).filter(function(n){return n; }).join();
     hash.table_id = this.id;
     hash[tableName + '_search'] = $('input#'+ this.id +'_fuzzy_search_query').val();
-    var form_array = $('.tabulatr_filter_form[data-table="'+ this.id +'"]')
-      .find('input:visible,select:visible,input[type=hidden]').serializeArray();
-    for(var i = 0; i < form_array.length; i++){
-      if(hash[form_array[i].name] !== undefined){
-        if(!Array.isArray(hash[form_array[i].name])){
-          hash[form_array[i].name] = [hash[form_array[i].name]];
-        }
-        hash[form_array[i].name].push(form_array[i].value);
-      }else{
-        hash[form_array[i].name] = form_array[i].value;
-      }
-    }
-    return hash;
+    return this.readParamsFromForm(hash);
   },
 
   localDate: function(value){
@@ -291,271 +209,51 @@ Tabulatr.prototype = {
     $('.tabulatr_count[data-table='+ tableId +']').html(count_string);
   },
 
-  prepareTableForInsert: function(tableId, append, dataCount, actualCount){
-    if(!append){
-      if(this.storePage){
-        $('#'+ tableId +' tbody tr').hide();
-      }else{
-        $('#'+ tableId +' tbody').html('');
-      }
-    }
-    if(dataCount === 0 || this.currentCount() + dataCount >= actualCount){
-      this.moreResults = false;
-      $('.pagination_trigger[data-table='+ tableId +']').unbind('inview');
-    }
-  }
-
-};
-
-$(document).on('ready page:load', function(){
-  tabulatr_tables = [];
-
-  $('th.tabulatr-sortable').click(function(){
-    var th = $(this);
-    var sort_by = th.data('tabulatr-column-name');
-    var dir = th.attr('data-sorted');
-    var table = th.parents('table');
-    var tableId = table.attr('id');
-    var table_obj;
-    for(var i = 0; i < tabulatr_tables.length; i++){
-      if(tabulatr_tables[i].id === tableId){
-        table_obj = tabulatr_tables[i];
-      }
-    }
-    var tableName = table_obj.id.split('_')[0];
-    table.find('th.tabulatr-sortable.sorted').removeClass('sorted').removeAttr('data-sorted');
-    dir = (dir === 'asc') ? 'desc' : 'asc';
-    th.addClass('sorted').attr('data-sorted', dir);
-    $('.tabulatr_filter_form[data-table='+ tableId +'] input[name='+ tableName +'_sort]').val(sort_by + ' '+  dir);
-    if(!table_obj.moreResults){
-      table_obj.moreResults = true;
-      if(table_obj.hasInfiniteScrolling){
-        $('.pagination_trigger[data-table='+ tableId +']').bind('inview', cbfn);
-      }
-    }
-    $($(this).parents('table').find('tbody tr')).remove();
-
-    $('.tabulatr_mark_all[data-table='+ tableName +']').prop('checked', false).prop('indeterminate', false);
-    table_obj.updateTable({});
-  });
-
-
-  $('.tabulatr_table').each(function(ix, el){
-    if($('.pagination[data-table="'+ $(el).attr('id') +'"]').length === 0){
-      $('.pagination_trigger[data-table="'+ $(el).attr('id') +'"]').bind('inview', cbfn);
-    }
-  });
-
-  $('.batch-action-inputs').click(function(){
-    var a = $(this);
-    var name = a.data('do-batch-action-name');
-    var key = a.data('do-batch-action');
-    var tableId = a.data('table-id');
-    var params = {page: 1};
-    params[name] = key;
-    params.tabulatr_checked = {checked_ids: jQuery.map($('#'+ tableId +' .tabulatr-checkbox:checked'), function(el){return $(el).val();}).join(',')};
-    var confirmation = true;
-    if(params.tabulatr_checked.checked_ids == ''){
-      confirmation = confirm(a.parents('ul').data('confirm-text'));
-    }
-    if(confirmation){
-      $('.tabulatr_mark_all[data-table='+ tableId +']').prop('indeterminate', false).prop('checked', false);
-      $('#'+ tableId +' .tabulatr-wrench').addClass('disabled');
-      var table_obj;
-      for(var i = 0; i < tabulatr_tables.length; i++){
-        if(tabulatr_tables[i].id === tableId){
-          table_obj = tabulatr_tables[i];
+  readParamsFromForm: function(hash){
+    var form_array = $('.tabulatr_filter_form[data-table="'+ this.id +'"]')
+      .find('input:visible,select:visible,input[type=hidden]').serializeArray();
+    for(var i = 0; i < form_array.length; i++){
+      if(hash[form_array[i].name] !== undefined){
+        if(!Array.isArray(hash[form_array[i].name])){
+          hash[form_array[i].name] = [hash[form_array[i].name]];
         }
-      }
-      table_obj.updateTable(params, true);
-    }
-  });
-
-  $('form.tabulatr-fuzzy-search').submit(function(){
-    var tableId = $(this).data('table');
-    var table_obj;
-    for(var i = 0; i < tabulatr_tables.length; i++){
-      if(tabulatr_tables[i].id === tableId){
-        table_obj = tabulatr_tables[i];
-      }
-    }
-    if(table_obj.hasInfiniteScrolling){
-      $('.pagination_trigger[data-table='+ tableId +']').unbind('inview', cbfn);
-      $('.pagination_trigger[data-table='+ tableId +']').bind('inview', cbfn);
-    }
-    table_obj.updateTable({page: 1, append: false}, true);
-    return false;
-  });
-
-  $('form.tabulatr_filter_form input, form.tabulatr_filter_form select').change(function(){
-    $(this).parents('form.tabulatr_filter_form').submit();
-  });
-
-  $('form.tabulatr_filter_form').submit(function(){
-    var tableId = $(this).data('table');
-    var table_obj;
-    for(var i = 0; i < tabulatr_tables.length; i++){
-      if(tabulatr_tables[i].id === tableId){
-        table_obj = tabulatr_tables[i];
-      }
-    }
-    table_obj.submitFilterForm();
-    return false;
-  });
-
-  $('.tabulatr_mark_all').click(function(){
-    var tableId = $(this).parents('table').prop('id');
-    var table_obj;
-    for(var i = 0; i < tabulatr_tables.length; i++){
-      if(tabulatr_tables[i].id === tableId){
-        table_obj = tabulatr_tables[i];
-      }
-    }
-    if($(this).is(':checked')){
-      $('#'+ tableId +' tr[data-page]:visible input[type=checkbox]').prop('checked', true);
-      $('#'+ tableId +' .tabulatr-wrench').removeClass('disabled');
-    }else{
-      $('#'+ tableId +' tr[data-page]:visible input[type=checkbox]').prop('checked', false);
-      if(table_obj.checkIfCheckboxesAreMarked()){
-        $('#'+ tableId +' .tabulatr-wrench').removeClass('disabled');
+        hash[form_array[i].name].push(form_array[i].value);
       }else{
-        $('#'+ tableId +' .tabulatr-wrench').addClass('disabled');
+        hash[form_array[i].name] = form_array[i].value;
       }
     }
-  });
+    return hash;
+  },
 
-  $('.tabulatr_table').on('click', 'input.tabulatr-checkbox', function(){
-    var $table = $(this).closest('.tabulatr_table');
-    var tableId = $table.attr('id');
-    var $markAllCheckbox = $table.find('.tabulatr_mark_all');
-    var table_obj;
-    for(var i = 0; i < tabulatr_tables.length; i++){
-      if(tabulatr_tables[i].id === tableId){
-        table_obj = tabulatr_tables[i];
-      }
+  getPageParams: function(hash){
+    var pagesize = hash.pagesize;
+    if(pagesize === undefined){
+      pagesize = $('table#'+ this.id).data('pagesize');
     }
-    if($(this).is(':checked')){
-      if($('#'+ tableId +' tr[data-page]:visible input[type=checkbox]').not(':checked').length > 0){
-        $markAllCheckbox.prop("indeterminate", true);
-      }else{
-        $markAllCheckbox.prop('indeterminate', false);
-        $markAllCheckbox.prop('checked', true);
+    if(hash.page === undefined){
+      if(this.hasInfiniteScrolling){
+        hash.page = Math.floor($('#'+ this.id +' tbody tr[class!=empty_row]').length/pagesize) + 1;
       }
-      $('#'+ tableId +' .tabulatr-wrench').removeClass('disabled');
-    }else{
-      if($('#'+ tableId +' tr[data-page]:visible input[type=checkbox]:checked').length > 0){
-        $markAllCheckbox.prop('indeterminate', true);
-        $('#'+ tableId +' .tabulatr-wrench').removeClass('disabled');
-      }else{
-        $markAllCheckbox.prop('indeterminate', false);
-        $markAllCheckbox.prop('checked', false);
-        if(table_obj.checkIfCheckboxesAreMarked()){
-          $('#'+ tableId +' .tabulatr-wrench').removeClass('disabled');
-        }else{
-          $('#'+ tableId +' .tabulatr-wrench').addClass('disabled');
-        }
+      if(!isFinite(hash.page)){
+        hash.page = 1;
       }
     }
-  });
+    hash.pagesize = pagesize;
+    return hash;
+  },
 
-  $('.tabulatr-per-page a').click(function(){
-    if($(this).hasClass('active')){ return false; }
-    $(this).closest('div').find('a').removeClass('active');
-    $(this).addClass('active');
-    var tableId = $(this).closest('div').data('table');
-    var table_obj;
-    for(var i = 0; i < tabulatr_tables.length; i++){
-      if(tabulatr_tables[i].id === tableId){
-        table_obj = tabulatr_tables[i];
-      }
-    }
-    table_obj.moreResults = true;
-    if(table_obj.hasInfiniteScrolling){
-      $('.pagination_trigger[data-table='+ tableId +']').bind('inview', cbfn);
-    }
-    if(typeof(Storage) !== undefined){
-      localStorage.tabulatr_page_display_count = $(this).data('items-per-page');
-    }
-    table_obj.updateTable({page: 1}, true);
-  });
-
-  $(document).on('click', 'a[data-tabulatr-reset]',function(){
-    var a = $(this);
-    var tableObj;
-    var tableId = a.data('tabulatrReset');
-    a.parents('.tabulatr-outer-wrapper').removeClass('filtered');
-    for(var i = 0; i < tabulatr_tables.length; i++){
-      if(tabulatr_tables[i].id === tableId){
-        tableObj = tabulatr_tables[i];
-        tableObj.resetTable();
-        return false;
+  prepareTableForInsert: function(tableId, append, dataCount, actualCount){
+    if(!append){
+      if(this.storePage){
+        $('#'+ tableId +' tbody tr').hide();
+      }else{
+        $('#'+ tableId +' tbody').html('');
       }
     }
-  });
-
-  if($('.tabulatr_table:not(".tabulatr_static_table")').length > 0){
-    if(typeof(Storage) !== undefined){
-      var count = localStorage.tabulatr_page_display_count;
-      if(count !== undefined){
-        $('.tabulatr-per-page a').removeClass('active');
-        $('.tabulatr-per-page a[data-items-per-page='+ count +']').
-          addClass('active');
-      }
+    if(dataCount === 0 || this.currentCount() + dataCount >= actualCount){
+      this.moreResults = false;
+      $('.pagination_trigger[data-table='+ tableId +']').unbind('inview');
     }
-    var tableObj, tableId, tabulatrTable;
-    $('.tabulatr_table:not(".tabulatr_static_table")').each(function(ix, el){
-      tableId = $(el).attr('id');
-      tabulatrTable = new Tabulatr(tableId);
-      if($(el).data('persistent')){
-        tabulatrTable.isAPersistedTable = true;
-      }
-      if($('.pagination[data-table='+ tableId +']').length === 0){
-        tabulatrTable.hasInfiniteScrolling = true;
-      }
-      tabulatr_tables.push(tabulatrTable);
-      for(var i = 0; i < tabulatr_tables.length; i++){
-        if(tabulatr_tables[i].id === tableId){
-          tableObj = tabulatr_tables[i];
-        }
-      }
-      tableObj.updateTable({}, false);
-    });
   }
 
-  $(document).on('click', 'a[data-show-filters-for]', function(){
-    var a = $(this);
-    a.parents('.tabulatr-outer-wrapper').addClass('filtered');
-  });
-
-});
-
-$(document).on('click', '.pagination a[data-page]', function(){
-  var a = $(this);
-  if(a.parent().hasClass('active') ||
-     a.parent().hasClass('disabled')){
-    return false;
-  }
-  var tableId = $(a).closest('.pagination').data('table');
-  $('.tabulatr_mark_all[data-table='+ tableId +']').prop('checked', false);
-  $('.tabulatr_mark_all[data-table='+ tableId +']').prop('indeterminate', false);
-  var table_obj;
-  for(var i = 0; i < tabulatr_tables.length; i++){
-    if(tabulatr_tables[i].id === tableId){
-      table_obj = tabulatr_tables[i];
-    }
-  }
-  table_obj.updateTable({append: false, page: a.data('page')});
-  return false;
-});
-
-
-$(document).on('change', 'select[data-tabulatr-date-filter]', function() {
-  var select = $(this);
-  var option = select.find('option:selected');
-  var val = option.val();
-  if (val === 'from_to') {
-    select.parents('.tabulatr-filter-row').find(".from_to").show().removeClass('hidden');
-  } else {
-    select.parents('.tabulatr-filter-row').find(".from_to").hide().val('');
-  }
-});
+};

data/app/assets/javascripts/tabulatr/application.js

@@ -1,3 +1,5 @@
 //= require ./_tabulatr
 //= require ./_storage
+//= require ./_pagination
+//= require ./_events
 //= require ./jquery.inview.min

data/app/views/tabulatr/_tabulatr_actual_table.html.slim

@@ -25,17 +25,17 @@
     thead
       tr
        - columns.each do |column|
-         - classes = column.sortable ? ['tabulatr-sortable'] : []
-         - classes = [classes, "tabulatr-column-#{column.coltype}", column.classes].flatten.compact.join(' ')
-         th data-tabulatr-column-name=column.full_name style=column.html_header_style class=classes
-           = column.human_name
+         - classes = column.col_options.sortable ? ['tabulatr-sortable'] : []
+         - classes = [classes, "tabulatr-column-#{column.coltype}", column.col_options.classes].flatten.compact.join(' ')
+         = content_tag('th', column.col_options.header_html.merge(:'data-tabulatr-column-name' => column.full_name, class: classes)) do
+             - column.human_name
     tbody
     tfoot
       tr.empty_row
         - columns.each do |column|
-          - classes = column.sortable ? ['tabulatr-sortable'] : []
-          - classes = [classes, "tabulatr-column-#{column.coltype}", column.classes].flatten.compact.join(' ')
-          td data-tabulatr-column-name=column.full_name data-tabulatr-type=column.coltype style=column.html_cell_style class=classes
+          - classes = column.col_options.sortable ? ['tabulatr-sortable'] : []
+          - classes = [classes, "tabulatr-column-#{column.coltype}", column.col_options.classes].flatten.compact.join(' ')
+          = content_tag('td', column.col_options.data_html.merge(:'data-tabulatr-column-name' => column.full_name, :'data-tabulatr-type' => column.coltype, class: classes)){}
   .tabulatr-spinner-box data-table=table_id
     = image_tag "#{Tabulatr.spinner}-loader.gif"
 span.pagination_trigger data-table="#{table_id}"

data/app/views/tabulatr/_tabulatr_filter_dialog.html.slim

@@ -44,7 +44,7 @@
                   - filter_name = "tabulatr_form_#{name}"
 
                   label.control-label for=filter_name
-                    = column.filter_label || column.human_name
+                    = column.col_options.filter_label || column.human_name
 
                   - if column.filter.is_a?(Hash) || column.filter.is_a?(Array) || column.filter.is_a?(String)
                     select.form-control.no-chosen id=name name=iname

data/app/views/tabulatr/_tabulatr_static_table.html.slim

@@ -23,11 +23,13 @@ table class="#{table_options[:html_class]} tabulatr_static_table"
   thead
     tr
      - columns.each do |column|
-       th data-tabulatr-column-name=column.full_name style=column.html_header_style class=["tabulatr-column-#{column.coltype}", column.classes].flatten.compact.join(' ')
-         = column.human_name
+       - classes = ["tabulatr-column#{column.coltype}", column.col_options.classes].flatten.compact.join(' ')
+       = content_tag('th', column.col_options.header_html.merge(:'data-tabulatr-column-name' => column.full_name, class: classes)) do
+          - column.human_name
   tbody
     - records.each do |record|
       tr data-id=record.try(:id)
         - columns.each do |column|
-          td data-tabulatr-column-name=column.full_name data-tabulatr-type=column.coltype style=column.html_cell_style class=["tabulatr-column-#{column.coltype}", column.classes].flatten.compact.join(' ')
+          - classes = ["tabulatr-column-#{column.coltype}", column.col_options.classes].flatten.compact.join(' ')
+          = content_tag('td', column.col_options.data_html.merge(:'data-tabulatr-column-name' => column.full_name, :'data-tabulatr-type' => column.coltype, class: classes)) do
             = column.value_for(record, self)

data/lib/tabulatr/data/data.rb

@@ -35,7 +35,7 @@ class Tabulatr::Data
     table_columns.map do |col|
       next if col.is_a? Tabulatr::Renderer::Checkbox
       col.klass = @base.reflect_on_association(col.table_name).try(:klass) || @base
-      col.determine_appropriate_filter! if col.filter === true
+      col.determine_appropriate_filter! if col.col_options.filter === true
     end
   end