Download as
Browse Code »

Commit 52bd1adb939250bee8b3390f5fafd3d5b5a52ec4

Authored by Braulio Bhavamitra
2 parents a5b68b1c cc833b49
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Merge branch 'favorite-has-many' into 'master' 

Use has_many through for favorite enterprises

This allow hooks for the joint model in the OpenGraphPlugin

See merge request !382
Showing 2 changed files with 10 additions and 1 deletions   Show diff stats
app/models/enterprise.rb
  Diff comments   View file @52bd1ad
... ... @@ -19,7 +19,8 @@ class Enterprise < Organization
19 19 has_many :inputs, :through => :products
20 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 25 def product_categories
25 26 ProductCategory.by_enterprise(self)
... ...
app/models/favorite_enterprise_person.rb 0 → 100644
  Diff comments   View file @52bd1ad
... ... @@ -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
... ...