diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 21b5e2b4c..86ff88415 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -236,8 +236,8 @@ module ApplicationHelper simple_form_for(model, **options, &block) end - def table_for(*options, &block) - table = TableBuilder.new(*options, &block) + def table_for(*args, **options, &block) + table = TableBuilder.new(*args, **options, &block) render "table_builder/table", table: table end diff --git a/app/logical/table_builder.rb b/app/logical/table_builder.rb index e47de0e64..a17f0f618 100644 --- a/app/logical/table_builder.rb +++ b/app/logical/table_builder.rb @@ -49,8 +49,8 @@ class TableBuilder yield self if block_given? end - def column(*options, &block) - @columns << Column.new(*options, &block) + def column(*args, **options, &block) + @columns << Column.new(*args, **options, &block) end def all_row_attributes(item, i) diff --git a/app/models/application_record.rb b/app/models/application_record.rb index 20c8cedd3..77beb584d 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -3,8 +3,8 @@ class ApplicationRecord < ActiveRecord::Base concerning :PaginationMethods do class_methods do - def paginate(*options) - extending(PaginationExtension).paginate(*options) + def paginate(*args, **options) + extending(PaginationExtension).paginate(*args, **options) end def paginated_search(params, defaults: {}, count_pages: params[:search].present?) @@ -413,9 +413,9 @@ class ApplicationRecord < ActiveRecord::Base concerning :UserMethods do class_methods do - def belongs_to_updater(options = {}) + def belongs_to_updater(**options) class_eval do - belongs_to :updater, options.merge(class_name: "User") + belongs_to :updater, class_name: "User", **options before_validation do |rec| rec.updater_id = CurrentUser.id rec.updater_ip_addr = CurrentUser.ip_addr if rec.respond_to?(:updater_ip_addr=)