effective_datatables 3.0.16 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a36c56e15a3e3c9d57862183dc41ed61dfa7be69
-  data.tar.gz: 38ada5d0f882aabd61510b21d2153bd0708ee437
+  metadata.gz: ed64f666d0e25311df8bd6d261f91561ff5a4b06
+  data.tar.gz: 80cbfdb2f683497fdbfff4f373068ee254fefb69
 SHA512:
-  metadata.gz: 6d0cfc1d01e242b7b5afe8b74b6c27d1cafc24fcf8bec8f1de0e13295ca9ae3f005e5dd9a5cb5c2d04f8d96ba9b8fc01b34592662dc74a46317a489f1cd59d61
-  data.tar.gz: 3379dbd9030d211d3f21d72a7c8db65ffb5746e506a6d9497b5d6b30eda3b78408ba00c546c17a4e3679929c9a7d7efc385a69c6cffb2fcee955263795472185
+  metadata.gz: c5f12a41603c30fdbaea17b0eabcdf801baada748aca0b020e0d570911389b599fb1c10a1b09b4b5a4cfa77346c85c70940435ddf7cac64d567c786c2336f2be
+  data.tar.gz: 149fcbcf5c3e48bf996db130b649b84acbfceac7f77b47a34a2db90e76c4228bedf96e9e9db6f96ace6826a17695c64c3ad0246942b5b2edd3a7d614b0211a9c

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

@@ -83,6 +83,10 @@ initializeDataTables = ->
         $table = $(this.api().table().node())
 
         if settings['json']
+          if settings['json']['effective_datatables_error']
+            alert("DataTable error: #{settings['json']['effective_datatables_error']}\n\nPlease refresh the page and try again")
+            return
+
           if settings['json']['aggregates']
             drawAggregates($table, settings['json']['aggregates'])
 

data/app/controllers/effective/datatables_controller.rb

@@ -4,22 +4,18 @@ module Effective
 
     # This will respond to both a GET and a POST
     def show
-      @datatable = find_datatable(params[:id]).try(:new)
-      @datatable.view = view_context if !@datatable.nil?
-
-      EffectiveDatatables.authorized?(self, :index, @datatable.try(:collection_class))
-
-      respond_to do |format|
-        format.html
-        format.json {
-          if Rails.env.production?
-            render json: (@datatable.to_json rescue error_json)
-          else
-            render json: @datatable.to_json
-          end
-        }
-      end
+      begin
+        @datatable = find_datatable(params[:id]).try(:new) || raise('unable to find datatable')
+        @datatable.view = view_context
+
+        EffectiveDatatables.authorized?(self, :index, @datatable.collection_class)
+
+        render json: @datatable.to_json
+      rescue => e
+        (EffectiveDatatables.authorized?(self, :index, @datatable.try(:collection_class)) rescue false)
 
+        render json: error_json(message: e.message)
+      end
     end
 
     private
@@ -29,15 +25,16 @@ module Effective
       id.classify.safe_constantize || id.classify.pluralize.safe_constantize
     end
 
-    def error_json
+    def error_json(message:)
       {
-        draw: params[:draw].to_i,
         data: [],
+        draw: params[:draw].to_i,
+        effective_datatables_error: message.presence || 'unknown error',
         recordsTotal: 0,
         recordsFiltered: 0,
         aggregates: [],
         charts: {}
-      }.to_json
+      }
     end
 
   end

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

@@ -11,7 +11,9 @@ module Effective
 
       def load_attributes!
         if datatables_ajax_request?
-          raise 'Expected attributes cookie to be present' unless cookie && cookie[:attributes]
+          raise 'expected cookie to be present' unless cookie
+          raise 'expected attributes cookie to be present' unless cookie[:attributes]
+
           @attributes = cookie.delete(:attributes)
         end
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.0.16'.freeze
+  VERSION = '3.1.0'.freeze
 end

metadata

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