diff --git a/config/initializers/cancancan.rb b/config/initializers/cancancan.rb new file mode 100644 index 0000000000..a0dc46e905 --- /dev/null +++ b/config/initializers/cancancan.rb @@ -0,0 +1,12 @@ +module CanCanUnauthorizedMessage + # Fix deprecated syntax calling I18n#translate (using keyword args) without using ** + def unauthorized_message(action, subject) + keys = unauthorized_message_keys(action, subject) + variables = {:action => action.to_s} + variables[:subject] = (subject.class == Class ? subject : subject.class).to_s.underscore.humanize.downcase + message = I18n.translate(nil, **variables.merge(:scope => :unauthorized, :default => keys + [""])) + message.blank? ? nil : message + end +end + +CanCan::Ability.prepend(CanCanUnauthorizedMessage) diff --git a/lib/open_food_network/sales_tax_report.rb b/lib/open_food_network/sales_tax_report.rb index f5f1adab03..3284d5b164 100644 --- a/lib/open_food_network/sales_tax_report.rb +++ b/lib/open_food_network/sales_tax_report.rb @@ -37,7 +37,7 @@ module OpenFoodNetwork def search permissions = ::Permissions::Order.new(user) - permissions.editable_orders.complete.not_state(:canceled).search(params[:q]) + permissions.editable_orders.complete.not_state(:canceled).ransack(params[:q]) end def orders