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

Merge remote-tracking branch 'tg-x/master'

Browse source 
Conflicts:
	app/views/shared/_open_orders.html.haml
This commit is contained in:
wvengen 2013-12-11 22:39:37 +01:00
commit e25570d870
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/helpers/group_orders_helper.rb
View file

@ -7,13 +7,20 @@ module GroupOrdersHelper
}.join("\n")
end
# Returns a link to the page where a group_order can be edited.
# If the option :show is true, the link is for showing the group_order.
def link_to_ordering(order, options = {})
path = if group_order = order.group_order(current_user.ordergroup)
group_order = order.group_order(current_user.ordergroup)
path = if options[:show] and group_order
group_order_path(group_order)
elsif group_order
edit_group_order_path(group_order, :order_id => order.id)
else
new_group_order_path(:order_id => order.id)
end
link_to order.name, path, options
options.delete(:show)
name = block_given? ? yield(order, group_order) : order.name
path ? link_to(name, path, options) : name
end
# Return css class names for order result table
@ -36,4 +43,4 @@ module GroupOrdersHelper
{group_order_article: goa, quantity: quantity, tolerance: tolerance, result: result, sub_total: sub_total}
end
end
end