Download as
Browse Code »

Commit 54abaf3e5882dae333416a19ecaf1d277292c519

Authored by DanielaFeitosa
1 parent 5ae25a69
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem6: Update relations 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@190 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 4 additions and 12 deletions   Show diff stats
app/models/enterprise.rb
  Diff comments   View file @54abaf3
1 #A enterprise is a kind of profile. According to the system concept, only enterprises can offer priducts/services 1 #A enterprise is a kind of profile. According to the system concept, only enterprises can offer priducts/services
2 -class Enterprise < ActiveRecord::Base 2 +class Enterprise < Profile
3 3
4 - after_create do |enterprise|  
5 - Profile.create!(:identifier => enterprise.name, :profile_owner_id => enterprise.id, :profile_owner_type => 'Enterprise')  
6 - end  
7 -  
8 - has_one :enterprise_profile, :class_name => 'Profile', :as => :profile_owner  
9 - has_many :affiliations  
10 - has_many :users, :through => :affiliations  
11 - belongs_to :manager, :class_name => 'User'  
12 -  
13 - validates_presence_of :name, :manager_id  
14 end 4 end
app/models/profile.rb
  Diff comments   View file @54abaf3
@@ -17,6 +17,8 @@ class Profile &lt; ActiveRecord::Base @@ -17,6 +17,8 @@ class Profile &lt; ActiveRecord::Base
17 community 17 community
18 ] 18 ]
19 19
  20 + has_many :affiliations
  21 + has_many :users, :through => :affiliations
20 has_many :domains, :as => :owner 22 has_many :domains, :as => :owner
21 belongs_to :virtual_community 23 belongs_to :virtual_community
22 belongs_to :profile_owner, :polymorphic => true 24 belongs_to :profile_owner, :polymorphic => true
app/models/user.rb
  Diff comments   View file @54abaf3
@@ -10,7 +10,7 @@ class User &lt; ActiveRecord::Base @@ -10,7 +10,7 @@ class User &lt; ActiveRecord::Base
10 10
11 has_one :personal_profile, :class_name => 'Profile', :as => :profile_owner 11 has_one :personal_profile, :class_name => 'Profile', :as => :profile_owner
12 has_many :affiliations 12 has_many :affiliations
13 - has_many :enterprises, :through => :affiliations 13 + has_many :profiles, :through => :affiliations
14 # Virtual attribute for the unencrypted password 14 # Virtual attribute for the unencrypted password
15 attr_accessor :password 15 attr_accessor :password
16 16