Merge branch 'master' into tests-rspec

Conflicts:
	Gemfile

app/controllers/articles_controller.rb

@@ -209,7 +209,7 @@ class ArticlesController < ApplicationController
   
   # fills a form whith values of the selected shared_article
   def import
-    @article = SharedArticle.find(params[:shared_article_id]).build_new_article
+    @article = SharedArticle.find(params[:shared_article_id]).build_new_article(@supplier)
     render :action => 'new', :layout => false
   end
   

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

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

app/models/shared_article.rb

@@ -7,8 +7,8 @@ class SharedArticle < ActiveRecord::Base
 
   belongs_to :shared_supplier, :foreign_key => :supplier_id
 
-  def build_new_article
-    shared_supplier.supplier.articles.build(
+  def build_new_article(supplier)
+    supplier.articles.build(
         :name => name,
         :unit => unit,
         :note => note,

app/models/shared_supplier.rb

@@ -5,7 +5,7 @@ class SharedSupplier < ActiveRecord::Base
   # set correct table_name in external DB
   self.table_name = 'suppliers'
 
-  has_one :supplier
+  has_many :suppliers
   has_many :shared_articles, :foreign_key => :supplier_id
 
   # These set of attributes are used to autofill attributes of new supplier,

app/models/user.rb

@@ -66,7 +66,7 @@ class User < ActiveRecord::Base
   end
 
   def receive_email?
-    settings.messages['send_as_email'] == "1" && email.present?
+    settings.messages['send_as_email'] && email.present?
   end
   
   # Sets the user's password. It will be stored encrypted along with a random salt.

app/views/suppliers/shared_suppliers.haml

@@ -17,7 +17,9 @@
         %td= shared_supplier.note
         %td= shared_supplier.delivery_days
         %td
-          - if shared_supplier.supplier
+          - if shared_supplier.suppliers.any?
             %i.icon-ok
+            = associated_supplier_names(shared_supplier)
+            = link_to t('.subscribe_again'), new_supplier_path(:shared_supplier_id => shared_supplier), class: 'btn'
           - else
             = link_to t('.subscribe'), new_supplier_path(:shared_supplier_id => shared_supplier), class: 'btn'