maint: Upgrade to ajax-datatables-rails 1.x

sman591 · sman591 · commit 3c2d6d336cb9 · 2019-05-29T12:00:22.000-04:00
diff --git a/Gemfile b/Gemfile
@@ -50,7 +50,7 @@ gem "file_validators"
 # Templating utilities
 gem 'haml-rails', '~> 2.0'
 gem 'simple_form'
-gem 'ajax-datatables-rails', '~> 0.4.0' # Does NOT follow semver
+gem 'ajax-datatables-rails', '~> 1.0'
 gem 'roadie-rails'
 gem 'chartkick', '~> 3.0'
 gem 'groupdate'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -44,8 +44,8 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    ajax-datatables-rails (0.4.3)
-      railties (>= 4.0)
+    ajax-datatables-rails (1.0.0)
+      railties (>= 4.2)
     ansi (1.5.0)
     archive-zip (0.12.0)
       io-like (~> 0.3.0)
@@ -451,7 +451,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  ajax-datatables-rails (~> 0.4.0)
+  ajax-datatables-rails (~> 1.0)
   audited (~> 4.7)
   aws-sdk-s3
   better_errors
diff --git a/app/controllers/manage/admins_controller.rb b/app/controllers/manage/admins_controller.rb
@@ -8,7 +8,7 @@ def index
   end
 
   def datatable
-    render json: AdminDatatable.new(view_context)
+    render json: AdminDatatable.new(params, view_context: view_context)
   end
 
   def show
diff --git a/app/controllers/manage/checkins_controller.rb b/app/controllers/manage/checkins_controller.rb
@@ -8,7 +8,7 @@ def index
   end
 
   def datatable
-    render json: CheckinDatatable.new(view_context)
+    render json: CheckinDatatable.new(params, view_context: view_context)
   end
 
   def show
diff --git a/app/controllers/manage/messages_controller.rb b/app/controllers/manage/messages_controller.rb
@@ -10,7 +10,7 @@ def index
   end
 
   def datatable
-    render json: BulkMessageDatatable.new(view_context)
+    render json: BulkMessageDatatable.new(params, view_context: view_context)
   end
 
   def show
diff --git a/app/controllers/manage/questionnaires_controller.rb b/app/controllers/manage/questionnaires_controller.rb
@@ -10,7 +10,7 @@ def index
   end
 
   def datatable
-    render json: QuestionnaireDatatable.new(view_context)
+    render json: QuestionnaireDatatable.new(params, view_context: view_context)
   end
 
   def show
diff --git a/app/controllers/manage/schools_controller.rb b/app/controllers/manage/schools_controller.rb
@@ -8,7 +8,7 @@ def index
   end
 
   def datatable
-    render json: SchoolDatatable.new(view_context)
+    render json: SchoolDatatable.new(params, view_context: view_context)
   end
 
   def show
diff --git a/app/datatables/admin_datatable.rb b/app/datatables/admin_datatable.rb
@@ -1,4 +1,4 @@
-class AdminDatatable < AjaxDatatablesRails::Base
+class AdminDatatable < ApplicationDatatable
   def_delegators :@view, :link_to, :manage_admin_path, :bold, :display_datetime
 
   def view_columns
diff --git a/app/datatables/application_datatable.rb b/app/datatables/application_datatable.rb
@@ -0,0 +1,9 @@
+class ApplicationDatatable < AjaxDatatablesRails::ActiveRecord
+  extend Forwardable
+  attr_reader :view
+
+  def initialize(params, opts = {})
+    @view = opts[:view_context]
+    super
+  end
+end
diff --git a/app/datatables/bulk_message_datatable.rb b/app/datatables/bulk_message_datatable.rb
@@ -1,4 +1,4 @@
-class BulkMessageDatatable < AjaxDatatablesRails::Base
+class BulkMessageDatatable < ApplicationDatatable
   def_delegators :@view, :link_to, :manage_message_path, :display_datetime, :bold, :h
 
   def view_columns
diff --git a/app/datatables/checkin_datatable.rb b/app/datatables/checkin_datatable.rb
@@ -1,4 +1,4 @@
-class CheckinDatatable < AjaxDatatablesRails::Base
+class CheckinDatatable < ApplicationDatatable
   def_delegators :@view, :link_to, :manage_checkin_path, :display_datetime, :bold
 
   def view_columns
diff --git a/app/datatables/questionnaire_datatable.rb b/app/datatables/questionnaire_datatable.rb
@@ -1,4 +1,4 @@
-class QuestionnaireDatatable < AjaxDatatablesRails::Base
+class QuestionnaireDatatable < ApplicationDatatable
   def_delegators :@view, :link_to, :manage_questionnaire_path, :manage_school_path, :current_user, :acc_status_class, :display_datetime, :bold
 
   def view_columns
diff --git a/app/datatables/school_datatable.rb b/app/datatables/school_datatable.rb
@@ -1,4 +1,4 @@
-class SchoolDatatable < AjaxDatatablesRails::Base
+class SchoolDatatable < ApplicationDatatable
   def_delegators :@view, :link_to, :manage_school_path, :bold
 
   def view_columns
diff --git a/config/initializers/ajax_datatables_rails.rb b/config/initializers/ajax_datatables_rails.rb
@@ -1,7 +1,4 @@
 AjaxDatatablesRails.configure do |config|
   # available options for db_adapter are: :pg, :mysql, :mysql2, :sqlite, :sqlite3
   config.db_adapter = :mysql2
-
-  # available options for orm are: :active_record, :mongoid
-  config.orm = :active_record
 end
diff --git a/vendor/cache/ajax-datatables-rails-0.4.3.gem b/vendor/cache/ajax-datatables-rails-0.4.3.gem
diff --git a/vendor/cache/ajax-datatables-rails-1.0.0.gem b/vendor/cache/ajax-datatables-rails-1.0.0.gem

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-class AdminDatatable < AjaxDatatablesRails::Base`
	`1`	`+class AdminDatatable < ApplicationDatatable`
`2`	`2`	`def_delegators :@view, :link_to, :manage_admin_path, :bold, :display_datetime`
`3`	`3`
`4`	`4`	`def view_columns`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-class BulkMessageDatatable < AjaxDatatablesRails::Base`
	`1`	`+class BulkMessageDatatable < ApplicationDatatable`
`2`	`2`	`def_delegators :@view, :link_to, :manage_message_path, :display_datetime, :bold, :h`
`3`	`3`
`4`	`4`	`def view_columns`