Download as
Browse Code »

Commit 07b42749f2cc58afb2c12edc4c191a8cfac0dc5f

Authored by Rodrigo Souto
Committed by Joenio Costa
1 parent 6845e153
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

Enterprise adds member through the id instead of the identifier 

(ActionItem1583)
Showing 3 changed files with 4 additions and 4 deletions   Show diff stats
app/controllers/my_profile/profile_members_controller.rb
  Diff comments   View file @07b4274
@@ -69,7 +69,7 @@ class ProfileMembersController < MyProfileController @@ -69,7 +69,7 @@ class ProfileMembersController < MyProfileController
69 69
70 def add_member 70 def add_member
71 if profile.enterprise? 71 if profile.enterprise?
72 - member = Person.find_by_identifier(params[:id]) 72 + member = Person.find(params[:id])
73 member.define_roles(Profile::Roles.all_roles(environment), profile) 73 member.define_roles(Profile::Roles.all_roles(environment), profile)
74 end 74 end
75 render :layout => false 75 render :layout => false
app/views/profile_members/find_users.rhtml
  Diff comments   View file @07b4274
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <%= button_to_remote_without_text(:add, _('Add member'), 17 <%= button_to_remote_without_text(:add, _('Add member'),
18 { :loading => '$("members-list").addClassName("loading")', 18 { :loading => '$("members-list").addClassName("loading")',
19 :update => 'members-list', 19 :update => 'members-list',
20 - :url => {:action => 'add_member', :profile => profile.identifier, :id => user.identifier}, 20 + :url => {:action => 'add_member', :profile => profile.identifier, :id => user.id},
21 :success => "$('tr-#{user.identifier}').hide()", 21 :success => "$('tr-#{user.identifier}').hide()",
22 :complete => '$("members-list").removeClassName("loading")'}) %> 22 :complete => '$("members-list").removeClassName("loading")'}) %>
23 23
test/functional/profile_members_controller_test.rb
  Diff comments   View file @07b4274
@@ -203,7 +203,7 @@ class ProfileMembersControllerTest &lt; Test::Unit::TestCase @@ -203,7 +203,7 @@ class ProfileMembersControllerTest &lt; Test::Unit::TestCase
203 login_as :test_user 203 login_as :test_user
204 204
205 u = create_user('member_wannabe').person 205 u = create_user('member_wannabe').person
206 - post :add_member, :profile => ent.identifier, :id => u.identifier 206 + post :add_member, :profile => ent.identifier, :id => u.id
207 ent.reload 207 ent.reload
208 208
209 assert_includes ent.members, p 209 assert_includes ent.members, p
@@ -216,7 +216,7 @@ class ProfileMembersControllerTest &lt; Test::Unit::TestCase @@ -216,7 +216,7 @@ class ProfileMembersControllerTest &lt; Test::Unit::TestCase
216 login_as :test_user 216 login_as :test_user
217 217
218 u = create_user('member_wannabe').person 218 u = create_user('member_wannabe').person
219 - post :add_member, :profile => ent.identifier, :id => u.identifier 219 + post :add_member, :profile => ent.identifier, :id => u.id
220 220
221 assert_equivalent Profile::Roles.all_roles(ent.environment).compact, u.role_assignments.find_all_by_resource_id(ent.id).map(&:role).compact 221 assert_equivalent Profile::Roles.all_roles(ent.environment).compact, u.role_assignments.find_all_by_resource_id(ent.id).map(&:role).compact
222 end 222 end