From 266d6ef834d902ae14355ff8d12cbfe90fe6e49b Mon Sep 17 00:00:00 2001 From: Liv Galendez Date: Fri, 6 Mar 2015 11:55:35 +1100 Subject: [PATCH] Fixed handling of distributors field --- app/views/admin/order_cycles/_row.html.haml | 22 +++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/app/views/admin/order_cycles/_row.html.haml b/app/views/admin/order_cycles/_row.html.haml index 91191a2a8a..a80cb7948a 100644 --- a/app/views/admin/order_cycles/_row.html.haml +++ b/app/views/admin/order_cycles/_row.html.haml @@ -7,13 +7,27 @@ - unless order_cycles_simple_index %td.suppliers - - order_cycle_permitted_in(order_cycle.suppliers).each do |s| - = s.name + - suppliers = order_cycle_permitted_in(order_cycle.suppliers) + - if suppliers.count > 3 + - supplier_list = suppliers.map(&:name).sort.join ', ' + %span.with-tip{'data-powertip' => supplier_list} + = suppliers.count + suppliers + - else + - suppliers.each do |s| + = s.name %br/ %td= order_cycle.coordinator.name %td.distributors - - order_cycle_permitted_in(order_cycle.distributors).each do |d| - = d.name + - distributors = order_cycle_permitted_in(order_cycle.distributors) + - if distributors.count > 3 + - distributor_list = distributors.map(&:name).sort.join ', ' + %span.with-tip{'data-powertip' => distributor_list} + = distributors.count + distributors + - else + - distributors.each do |d| + = d.name %br/ %td.products