Download as
Browse Code »

Commit 040516df7762f60f5f8dcd6652259a78320142f0

Authored by André Guedes
1 parent cbf24413
Exists in master and in 26 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_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

Fixed custom_roles method replacement on profile_member_controller

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/controllers/my_profile/profile_members_controller.rb
  Diff comments   View file @040516d
@@ -58,7 +58,7 @@ class ProfileMembersController < MyProfileController @@ -58,7 +58,7 @@ class ProfileMembersController < MyProfileController
58 58
59 def change_role 59 def change_role
60 @roles = Profile::Roles.organization_member_roles(environment.id) 60 @roles = Profile::Roles.organization_member_roles(environment.id)
61 - @custom_roles = Profile::Roles.organization_custom_roles(environment.id, profile.id) 61 + @custom_roles = profile.custom_roles
62 begin 62 begin
63 @member = profile.members.find(params[:id]) 63 @member = profile.members.find(params[:id])
64 rescue ActiveRecord::RecordNotFound 64 rescue ActiveRecord::RecordNotFound
app/models/profile.rb
  Diff comments   View file @040516d
@@ -43,7 +43,7 @@ class Profile < ActiveRecord::Base @@ -43,7 +43,7 @@ class Profile < ActiveRecord::Base
43 find_role('editor', env_id) 43 find_role('editor', env_id)
44 end 44 end
45 def self.organization_member_roles(env_id) 45 def self.organization_member_roles(env_id)
46 - all_roles(env_id).select{ |r| r.key.match(/^profile_/) unless r.key.blank? } 46 + all_roles(env_id).select{ |r| r.key.match(/^profile_/) unless r.key.blank? || !r.profile_id.nil?}
47 end 47 end
48 def self.all_roles(env_id) 48 def self.all_roles(env_id)
49 Role.all :conditions => { :environment_id => env_id } 49 Role.all :conditions => { :environment_id => env_id }