Download as
Browse Code »

Commit fe26291a5591f11b3dcb486ab324ada967349a2b

Authored by MoisesMachado
1 parent 4548a0ce
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: profile association made polymorphic 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@176 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 6 changed files with 24 additions and 8 deletions   Show diff stats
app/models/enterprise.rb
  Diff comments   View file @fe26291
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 < ActiveRecord::Base
3 3
4 - has_one :enterprise_profile, :class_name => Profile 4 + after_create do |enterprise|
  5 + enterprise_profile = Profile.create(:identifier => enterprise.name)
  6 + end
  7 +
  8 + has_one :enterprise_profile, :class_name => Profile, :as => :profile_owner
  9 +
  10 + def name=(a_name)
  11 + enterprise_profile.name = a_name
  12 + end
  13 +
  14 + def name
  15 + enterprise_profile.name
  16 + end
5 17
6 end 18 end
app/models/profile.rb
  Diff comments   View file @fe26291
@@ -19,7 +19,7 @@ class Profile &lt; ActiveRecord::Base @@ -19,7 +19,7 @@ class Profile &lt; ActiveRecord::Base
19 19
20 has_many :domains, :as => :owner 20 has_many :domains, :as => :owner
21 belongs_to :virtual_community 21 belongs_to :virtual_community
22 - belongs_to :user 22 + belongs_to :profile_owner, :polymorphic => true
23 23
24 24
25 # Sets the identifier for this profile. Raises an exception when called on a 25 # Sets the identifier for this profile. Raises an exception when called on a
app/models/user.rb
  Diff comments   View file @fe26291
@@ -5,9 +5,10 @@ require &#39;digest/sha1&#39; @@ -5,9 +5,10 @@ require &#39;digest/sha1&#39;
5 class User < ActiveRecord::Base 5 class User < ActiveRecord::Base
6 6
7 after_create do |user| 7 after_create do |user|
8 - Profile.create!(:identifier => user.login, :user_id => user.id) 8 + personal_profile = Profile.create!(:identifier => user.login)
9 end 9 end
10 - has_one :personal_profile, :class_name => Profile 10 +
  11 + has_one :personal_profile, :class_name => Profile, :as => :profile_owner
11 12
12 # Virtual attribute for the unencrypted password 13 # Virtual attribute for the unencrypted password
13 attr_accessor :password 14 attr_accessor :password
db/migrate/002_create_profiles.rb
  Diff comments   View file @fe26291
@@ -4,7 +4,8 @@ class CreateProfiles &lt; ActiveRecord::Migration @@ -4,7 +4,8 @@ class CreateProfiles &lt; ActiveRecord::Migration
4 t.column :name, :string 4 t.column :name, :string
5 t.column :identifier, :string 5 t.column :identifier, :string
6 t.column :virtual_community_id, :integer 6 t.column :virtual_community_id, :integer
7 - t.column :user_id, :integer 7 + t.column :profile_owner_id, :integer
  8 + t.column :profile_owner_type, :string
8 t.column :template, :string, :default => "default" 9 t.column :template, :string, :default => "default"
9 t.column :theme, :string, :default => "default" 10 t.column :theme, :string, :default => "default"
10 t.column :icon_theme, :string, :default => "default" 11 t.column :icon_theme, :string, :default => "default"
test/fixtures/profiles.yml
  Diff comments   View file @fe26291
@@ -4,7 +4,8 @@ johndoe: @@ -4,7 +4,8 @@ johndoe:
4 name: 'John Doe' 4 name: 'John Doe'
5 identifier: johndoe 5 identifier: johndoe
6 virtual_community_id: 1 6 virtual_community_id: 1
7 - user_id: 1 7 + profile_owner_id: 1
  8 + profile_owner_type: 'User'
8 template: 'default' 9 template: 'default'
9 icon_theme: 'default' 10 icon_theme: 'default'
10 theme: 'default' 11 theme: 'default'
@@ -13,7 +14,8 @@ joerandomhacker: @@ -13,7 +14,8 @@ joerandomhacker:
13 name: 'Joe Random Hacker' 14 name: 'Joe Random Hacker'
14 identifier: joerandomhacker 15 identifier: joerandomhacker
15 virtual_community_id: 1 16 virtual_community_id: 1
16 - user_id: 2 17 + profile_owner_id: 2
  18 + profile_owner_type: 'User'
17 template: 'simple' 19 template: 'simple'
18 icon_theme: 'simple' 20 icon_theme: 'simple'
19 theme: 'simple' 21 theme: 'simple'
test/unit/user_test.rb
  Diff comments   View file @fe26291
@@ -74,7 +74,7 @@ class UserTest &lt; Test::Unit::TestCase @@ -74,7 +74,7 @@ class UserTest &lt; Test::Unit::TestCase
74 74
75 user = User.create!(:login => 'new_user', :email => 'new_user@example.com', :password => 'test', :password_confirmation => 'test') 75 user = User.create!(:login => 'new_user', :email => 'new_user@example.com', :password => 'test', :password_confirmation => 'test')
76 76
77 - assert Profile.exists?(['user_id = ?', user.id]) 77 + assert Profile.exists?(['profile_owner_id = ? and profile_owner_type = "User"', user.id])
78 78
79 assert_equal users_count + 1, User.count 79 assert_equal users_count + 1, User.count
80 assert_equal profiles_count + 1, Profile.count 80 assert_equal profiles_count + 1, Profile.count