Merge pull request #2963 from AndrewKvalheim/ajax-datatables-rails-1

Update UserDatatable for ajax-datatables-rails 1
This commit is contained in:
Henne Vogelsang 2022-03-08 13:22:33 +01:00 committed by GitHub
commit b04ad33138
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions

View file

@ -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

View file

@ -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

View file

@ -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