Merge remote-tracking branch 'origin/master'

Weblate
2 parents 7d11f5ab 52bd1adb
Showing 2 changed files with 10 additions and 1 deletions Show diff stats
app/models/enterprise.rb
app/models/favorite_enterprise_person.rb
@@ -19,7 +19,8 @@ class Enterprise &lt; Organization
   has_many :inputs, :through => :products
   has_many :production_costs, :as => :owner
-  has_and_belongs_to_many :fans, :class_name => 'Person', :join_table => 'favorite_enteprises_people'
+  has_many :favorite_enterprise_people
+  has_many :fans, through: :favorite_enterprise_people, source: :person
   def product_categories
     ProductCategory.by_enterprise(self)
@@ -0,0 +1,8 @@
+class FavoriteEnterprisePerson < ActiveRecord::Base
+
+  self.table_name = :favorite_enteprises_people
+
+  belongs_to :enterprise
+  belongs_to :person
+
+end
	@@ -19,7 +19,8 @@ class Enterprise < Organization		@@ -19,7 +19,8 @@ class Enterprise < Organization
19	has_many :inputs, :through => :products	19	has_many :inputs, :through => :products
20	has_many :production_costs, :as => :owner	20	has_many :production_costs, :as => :owner
21		21
22	- has_and_belongs_to_many :fans, :class_name => 'Person', :join_table => 'favorite_enteprises_people'	22	+ has_many :favorite_enterprise_people
		23	+ has_many :fans, through: :favorite_enterprise_people, source: :person
23		24
24	def product_categories	25	def product_categories
25	ProductCategory.by_enterprise(self)	26	ProductCategory.by_enterprise(self)
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+class FavoriteEnterprisePerson < ActiveRecord::Base
	2	+
	3	+ self.table_name = :favorite_enteprises_people
	4	+
	5	+ belongs_to :enterprise
	6	+ belongs_to :person
	7	+
	8	+end