diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 6b317a7e..b980540c 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -23,7 +23,7 @@ module Admin respond_to do |format| format.html format.json do - render json: UserDatatable.new(view_context: view_context) + render json: UserDatatable.new({}, view_context: view_context) end end end diff --git a/app/datatables/user_datatable.rb b/app/datatables/user_datatable.rb index cc2ece66..b21f6fea 100644 --- a/app/datatables/user_datatable.rb +++ b/app/datatables/user_datatable.rb @@ -1,12 +1,17 @@ # frozen_string_literal: true -class UserDatatable < AjaxDatatablesRails::Base +class UserDatatable < AjaxDatatablesRails::ActiveRecord extend Forwardable def_delegator :@view, :show_roles def_delegator :@view, :admin_user_path def_delegator :@view, :edit_admin_user_path + def initialize(params, opts = {}) + @view = opts[:view_context] + super + end + def view_columns # Declare strings in this format: ModelName.column_name # or in aliased_join_table.column_name format diff --git a/spec/datatables/user_datatable_spec.rb b/spec/datatables/user_datatable_spec.rb index 89c2b7e3..33d2d4d7 100644 --- a/spec/datatables/user_datatable_spec.rb +++ b/spec/datatables/user_datatable_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' describe UserDatatable do subject! do - described_class.new(view) + described_class.new({}, view_context: view) end let(:data_cols) do