From b53cb3671488a67cf8724abc8f77de5b302eeb9b Mon Sep 17 00:00:00 2001 From: wvengen Date: Wed, 11 Dec 2013 22:58:45 +0100 Subject: [PATCH] give proper block to link_to_ordering (closes #201) --- app/helpers/group_orders_helper.rb | 16 ++++++++-------- app/views/shared/_open_orders.html.haml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/helpers/group_orders_helper.rb b/app/helpers/group_orders_helper.rb index 11434a83..bf490903 100644 --- a/app/helpers/group_orders_helper.rb +++ b/app/helpers/group_orders_helper.rb @@ -9,17 +9,17 @@ module GroupOrdersHelper # 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 = {}) + def link_to_ordering(order, options = {}, &block) 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 + 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 options.delete(:show) - name = block_given? ? yield(order, group_order) : order.name + name = block_given? ? capture(&block) : order.name path ? link_to(name, path, options) : name end diff --git a/app/views/shared/_open_orders.html.haml b/app/views/shared/_open_orders.html.haml index 7a6f8591..eddc82ab 100644 --- a/app/views/shared/_open_orders.html.haml +++ b/app/views/shared/_open_orders.html.haml @@ -22,7 +22,7 @@ %td= "#{show_user group_order.updated_by} (#{format_time(group_order.updated_on)})" %td.numeric = link_to_ordering(order, show: true) do - - number_to_currency(group_order.price) + = number_to_currency(group_order.price) - else %td{:colspan => 2} - if total > 0