Download as
Browse Code »

Commit 9ddf3eb1df80b04769540d05f68d73a4b8b1b7be

Authored by MoisesMachado
1 parent d07e4225
Exists in master and in 28 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, stable, temp_ratings, tests, tests_fixies

ActionItem6: added association between users and enterprises 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@183 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 6 additions and 4 deletions   Show diff stats
app/models/enterprise.rb
  Diff comments   View file @9ddf3eb
@@ -6,7 +6,8 @@ class Enterprise < ActiveRecord::Base @@ -6,7 +6,8 @@ class Enterprise < ActiveRecord::Base
6 end 6 end
7 7
8 has_one :enterprise_profile, :class_name => 'Profile', :as => :profile_owner 8 has_one :enterprise_profile, :class_name => 'Profile', :as => :profile_owner
9 - has_many :users  
10 -  
11 - validates_presence_of :name 9 + has_many :users, :through => :affiliation
  10 + belongs_to :manager, :class_name => 'User'
  11 +
  12 + validates_presence_of :name, :manager_id
12 end 13 end
app/models/user.rb
  Diff comments   View file @9ddf3eb
@@ -9,7 +9,8 @@ class User < ActiveRecord::Base @@ -9,7 +9,8 @@ class User < ActiveRecord::Base
9 end 9 end
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 - 12 + has_many :affiliations
  13 + has_many :enterprises, :through => :affiliation
13 # Virtual attribute for the unencrypted password 14 # Virtual attribute for the unencrypted password
14 attr_accessor :password 15 attr_accessor :password
15 16