mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-01-30 21:27:17 +00:00
Ransack.search is deprecated. Use .ransack instead
https://github.com/activerecord-hackery/ransack/pull/975
This commit is contained in:
@@ -44,7 +44,7 @@ module Permissions
|
||||
def filtered_orders(orders)
|
||||
return orders unless filter_orders?
|
||||
|
||||
orders.complete.not_state(:canceled).search(search_params).result
|
||||
orders.complete.not_state(:canceled).ransack(search_params).result
|
||||
end
|
||||
|
||||
def filter_orders?
|
||||
|
||||
@@ -36,7 +36,7 @@ module OpenFoodNetwork
|
||||
def search
|
||||
@permissions.visible_orders.select("DISTINCT spree_orders.*").
|
||||
complete.not_state(:canceled).
|
||||
search(@params[:q])
|
||||
ransack(@params[:q])
|
||||
end
|
||||
|
||||
def table
|
||||
|
||||
@@ -51,7 +51,7 @@ module OpenFoodNetwork
|
||||
not_state(:canceled).
|
||||
distributed_by_user(@user).
|
||||
managed_by(@user).
|
||||
search(params[:q])
|
||||
ransack(params[:q])
|
||||
end
|
||||
|
||||
def orders
|
||||
|
||||
@@ -36,7 +36,7 @@ module OpenFoodNetwork
|
||||
end
|
||||
|
||||
def search
|
||||
Spree::Order.complete.not_state(:canceled).managed_by(@user).search(params[:q])
|
||||
Spree::Order.complete.not_state(:canceled).managed_by(@user).ransack(params[:q])
|
||||
end
|
||||
|
||||
def table_items
|
||||
|
||||
@@ -38,7 +38,7 @@ module OpenFoodNetwork
|
||||
attr_reader :orders_relation, :order_permissions
|
||||
|
||||
def search_orders
|
||||
orders_relation.search(@params[:q])
|
||||
orders_relation.ransack(@params[:q])
|
||||
end
|
||||
|
||||
# From the line_items given, returns the ones that are editable by the user
|
||||
|
||||
@@ -20,7 +20,7 @@ module OpenFoodNetwork
|
||||
|
||||
def search
|
||||
permissions = ::Permissions::Order.new(@user)
|
||||
permissions.editable_orders.complete.not_state(:canceled).search(@opts[:q])
|
||||
permissions.editable_orders.complete.not_state(:canceled).ransack(@opts[:q])
|
||||
end
|
||||
|
||||
def orders
|
||||
|
||||
Reference in New Issue
Block a user