From f4a0e292979ca87585d8ff880080555a8346f189 Mon Sep 17 00:00:00 2001
From: Benjamin Meichsner <benni@posteo.de>
Date: Wed, 12 Jun 2013 10:47:54 +0200
Subject: [PATCH] Fixed bug in with new shared multiple suppliers feature.

---
 app/controllers/suppliers_controller.rb   | 2 +-
 app/helpers/suppliers_helper.rb           | 6 ++++++
 app/views/suppliers/shared_suppliers.haml | 6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 app/helpers/suppliers_helper.rb

diff --git a/app/controllers/suppliers_controller.rb b/app/controllers/suppliers_controller.rb
index 8b8af131..4c9a4852 100644
--- a/app/controllers/suppliers_controller.rb
+++ b/app/controllers/suppliers_controller.rb
@@ -18,7 +18,7 @@ class SuppliersController < ApplicationController
   def new
     if params[:shared_supplier_id]
       shared_supplier =  SharedSupplier.find(params[:shared_supplier_id])
-      @supplier = shared_supplier.build_supplier(shared_supplier.autofill_attributes)
+      @supplier = shared_supplier.suppliers.new(shared_supplier.autofill_attributes)
     else
       @supplier = Supplier.new
     end
diff --git a/app/helpers/suppliers_helper.rb b/app/helpers/suppliers_helper.rb
new file mode 100644
index 00000000..9876f11d
--- /dev/null
+++ b/app/helpers/suppliers_helper.rb
@@ -0,0 +1,6 @@
+module SuppliersHelper
+
+  def associated_supplier_names(shared_supplier)
+    "(#{shared_supplier.suppliers.map(&:name).join(', ')})"
+  end
+end
\ No newline at end of file
diff --git a/app/views/suppliers/shared_suppliers.haml b/app/views/suppliers/shared_suppliers.haml
index 0c060582..30355291 100644
--- a/app/views/suppliers/shared_suppliers.haml
+++ b/app/views/suppliers/shared_suppliers.haml
@@ -22,9 +22,9 @@
         %td= shared_supplier.note
         %td= shared_supplier.delivery_days
         %td
-          - if shared_supplier.suppliers
+          - if shared_supplier.suppliers.any?
             %i.icon-ok
-            = '(' + shared_supplier.suppliers.map{|s| s.name}.join(', ') + ')'
-            = link_to "abonnieren", new_supplier_path(:shared_supplier_id => shared_supplier), class: 'btn'
+            = associated_supplier_names(shared_supplier)
+            = link_to "erneut abonnieren", new_supplier_path(:shared_supplier_id => shared_supplier), class: 'btn'
           - else
             = link_to "abonnieren", new_supplier_path(:shared_supplier_id => shared_supplier), class: 'btn'