Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Fixed ensure_open_order filter on missing id params.

Browse source
This commit is contained in:
Benjamin Meichsner 2014-09-23 10:39:10 +02:00
parent d9e8f29d44
commit cc4e925c1a
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/group_orders_controller.rb
View file

@ -49,7 +49,7 @@ class GroupOrdersController < ApplicationController
redirect_to group_orders_url, :alert => I18n.t('group_orders.update.error_general') redirect_to group_orders_url, :alert => I18n.t('group_orders.update.error_general')
end end
end end
# Shows all Orders of the Ordergroup # Shows all Orders of the Ordergroup
# if selected, it shows all orders of the foodcoop # if selected, it shows all orders of the foodcoop
def archive def archive
@ -74,11 +74,13 @@ class GroupOrdersController < ApplicationController
end end
def ensure_open_order def ensure_open_order
@order = Order.includes([:supplier, :order_articles]).find(params[:order_id] || params[:group_order][:order_id]) @order = Order.includes([:supplier, :order_articles]).find(order_id_param)
unless @order.open? unless @order.open?
flash[:notice] = I18n.t('group_orders.errors.closed') flash[:notice] = I18n.t('group_orders.errors.closed')
redirect_to :action => 'index' redirect_to :action => 'index'
end end
rescue ActiveRecord::RecordNotFound
redirect_to group_orders_url, alert: I18n.t('group_orders.errors.notfound')
end end
def ensure_my_group_order def ensure_my_group_order
@ -95,4 +97,8 @@ class GroupOrdersController < ApplicationController
end end
end end
def order_id_param
params[:order_id] || (params[:group_order] && params[:group_order][:order_id])
end
end end