grid_table 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6037e9f180243d42182c4eb6a5739fc457d256d
-  data.tar.gz: 34ddfabfae33383f69c46f4f4d1920d78d1ab495
+  metadata.gz: 1b27c4be55d74d0ccf12bd427010198b701bdca0
+  data.tar.gz: 8e36d295b387aabfde419f540831d6ffc9bcac17
 SHA512:
-  metadata.gz: 9b74ed307fb917880bad85c2f519f962c6370cc9fdf1f9515a1b0ba4ed828a1f37f28ed65fd8f525d3d7ff21753796bf91c13e41c8250f0482c1d6560b469e5f
-  data.tar.gz: 83537aac94772bf820c8650a246eccc7171c51eecac5215b91b1b4053e36db27b455faf288f32b2d0b09913853194fa3ef82b21c64321186dae180aaeb54b1f5
+  metadata.gz: 4aeac716e13fd0351d22ef03e0513b38c93441ab804456f3d899ae0e2452fa564ad7202835d0b5bdb05cca0af2c1cf7dd534eb3cac747c286dbc346d969f2d0e
+  data.tar.gz: fbf43395823247b8ac48b06d44619ff8d952f284c19a8be0c3e570d14ebf8c1644f4547cf47a310ce2e4fcc5c2b7d986c7e42c301e668d36e812663ed6c3f27c

data/.rubocop.yml

@@ -1,4 +1,5 @@
 AllCops:
+  TargetRubyVersion: 2.4
   Include:
     - Rakefile
     - '**/Gemfile'

data/lib/grid_table/control.rb

@@ -70,10 +70,14 @@ class GridTable::Control
         records
       end
     else
-      prepared_records(records).order("#{table_with_column} #{sort_order}")
+      prepared_records(records).order("#{column} #{sort_order}")
     end
   end
 
+  def select
+    "#{table_with_column} as #{column}"
+  end
+
   def url_param
     @attribute
   end

data/lib/grid_table/table.rb

@@ -25,6 +25,7 @@ class GridTable::Table
     @params   = params.to_h.with_indifferent_access
     @records  = resource
 
+    select
     filter! unless params[:skip_filtering]
     @total_rows = @records.length
     sort! unless params[:skip_sorting]
@@ -61,6 +62,10 @@ class GridTable::Table
     end
   end
 
+  def select
+    @records = @records.select(@controls.map(&:select).join(','))
+  end
+
   def sort!
     control = GridTable::Control.find_by_param(@params[:sort], @controls)
 

data/lib/grid_table/version.rb

@@ -1,3 +1,3 @@
 module GridTable
-  VERSION = '1.4.1'.freeze
+  VERSION = '1.5.0'.freeze
 end

data/vendor/assets/javascripts/gridtable.js

@@ -80,13 +80,9 @@ GridTable = (function() {
   };
 
   GridTable.prototype.gridTableParams = null;
-
   GridTable.prototype.gridTableDOM = null;
-
   GridTable.prototype.loadDataCompleteCallback = null;
-
   GridTable.prototype.loadDataStartCallback = null;
-
   GridTable.prototype.loadDataErrorCallback = null;
 
   function GridTable(params) {
@@ -139,22 +135,28 @@ GridTable = (function() {
         });
       };
     })(this));
-    this.gridTableDOM.find('.grid-pager #pagesize').each((function(_this) {
+    this.gridTableDOM.find('#pagesize, .pagesize').each((function(_this) {
       return function(index, elem) {
         var pageSizeSelect, size, _i, _len, _ref;
-        pageSizeSelect = '<select id="page-size-select">';
-        _ref = _this.gridTableParams.pageSizeOptions;
-        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-          size = _ref[_i];
-          if (size === _this.gridTableParams.pageSize) {
-            pageSizeSelect += "<option selected value=\"" + size + "\">" + size + "</option>";
-          } else {
-            pageSizeSelect += "<option value=\"" + size + "\">" + size + "</option>";
+
+        pageSizeSelect = $(elem).find(".page-size-select");
+
+        if (pageSizeSelect == null) {
+          pageSizeSelect = '<select class="page-size-select">';
+          _ref = _this.gridTableParams.pageSizeOptions;
+          for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+            size = _ref[_i];
+            if (size === _this.gridTableParams.pageSize) {
+              pageSizeSelect += "<option selected value=\"" + size + "\">" + size + "</option>";
+            } else {
+              pageSizeSelect += "<option value=\"" + size + "\">" + size + "</option>";
+            }
           }
+          pageSizeSelect += '</select>';
+          $(elem).append(pageSizeSelect);
         }
-        pageSizeSelect += '</select>';
-        $(elem).append(pageSizeSelect);
-        return $(elem).find('#page-size-select').on("change", function(event) {
+
+        return $(elem).find('.page-size-select').on("change", function(event) {
           return _this.setPageSize($(event.currentTarget).val());
         });
       };
@@ -234,8 +236,10 @@ GridTable = (function() {
   };
 
   GridTable.prototype.loadData = function(params) {
-    if ($('li#pagedisplay').data('initial-page') != null) {
-      this.gridTableParams.page = $('li#pagedisplay').data('initial-page');
+    var page_display = this.gridTableDOM.find('#pagedisplay, .pagedisplay');
+
+    if (page_display.data('initial-page') != null) {
+      this.gridTableParams.page = page_display.data('initial-page');
     }
     if (params == null) {
       params = {};
@@ -285,8 +289,10 @@ GridTable = (function() {
   };
 
   GridTable.prototype.clearInitialValues = function() {
-    $('li#pagedisplay').data('initial-page', null);
-    $('li#pagedisplay').data('initial-id', null);
+    var page_display = this.gridTableDOM.find('#pagedisplay, .pagedisplay');
+
+    page_display.data('initial-page', null);
+    page_display.data('initial-id', null);
   }
 
   GridTable.prototype.exportData = function() {
@@ -303,11 +309,11 @@ GridTable = (function() {
   GridTable.prototype.updatePagerDisplay = function(total_rows) {
     var back_enabled, display, first, forward_enabled, last, last_page, next, pager, previous;
     pager = this.gridTableDOM.find('.grid-pager');
-    first = $(pager).find('#first');
-    previous = $(pager).find('#previous');
-    next = $(pager).find('#next');
-    last = $(pager).find('#last');
-    display = $(pager).find('#pagedisplay');
+    first = $(pager).find('#first, .first');
+    previous = $(pager).find('#previous, .previous');
+    next = $(pager).find('#next, .next');
+    last = $(pager).find('#last, .last');
+    display = $(pager).find('#pagedisplay, .pagedisplay');
     $(first).off('click');
     $(previous).off('click');
     $(next).off('click');
@@ -389,19 +395,12 @@ GridTable = (function() {
 
   GridTableParams = (function() {
     GridTableParams.prototype.id = null;
-
     GridTableParams.prototype.url = null;
-
     GridTableParams.prototype.sortCol = '';
-
     GridTableParams.prototype.sortOrder = '';
-
     GridTableParams.prototype.filter = {};
-
     GridTableParams.prototype.page = 0;
-
     GridTableParams.prototype.pageSize = 10;
-
     GridTableParams.prototype.pageSizeOptions = [5, 10, 25, 50, 100, 200];
 
     function GridTableParams(params) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grid_table
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Jon Principe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler