From 07b42749f2cc58afb2c12edc4c191a8cfac0dc5f Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Mon, 12 Jul 2010 13:59:58 -0300 Subject: [PATCH] Enterprise adds member through the id instead of the identifier --- app/controllers/my_profile/profile_members_controller.rb | 2 +- app/views/profile_members/find_users.rhtml | 2 +- test/functional/profile_members_controller_test.rb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/my_profile/profile_members_controller.rb b/app/controllers/my_profile/profile_members_controller.rb index 0a0bce3..38ac8d6 100644 --- a/app/controllers/my_profile/profile_members_controller.rb +++ b/app/controllers/my_profile/profile_members_controller.rb @@ -69,7 +69,7 @@ class ProfileMembersController < MyProfileController def add_member if profile.enterprise? - member = Person.find_by_identifier(params[:id]) + member = Person.find(params[:id]) member.define_roles(Profile::Roles.all_roles(environment), profile) end render :layout => false diff --git a/app/views/profile_members/find_users.rhtml b/app/views/profile_members/find_users.rhtml index 14ec72d..4ec8963 100644 --- a/app/views/profile_members/find_users.rhtml +++ b/app/views/profile_members/find_users.rhtml @@ -17,7 +17,7 @@ <%= button_to_remote_without_text(:add, _('Add member'), { :loading => '$("members-list").addClassName("loading")', :update => 'members-list', - :url => {:action => 'add_member', :profile => profile.identifier, :id => user.identifier}, + :url => {:action => 'add_member', :profile => profile.identifier, :id => user.id}, :success => "$('tr-#{user.identifier}').hide()", :complete => '$("members-list").removeClassName("loading")'}) %> diff --git a/test/functional/profile_members_controller_test.rb b/test/functional/profile_members_controller_test.rb index 1194a1e..12531df 100644 --- a/test/functional/profile_members_controller_test.rb +++ b/test/functional/profile_members_controller_test.rb @@ -203,7 +203,7 @@ class ProfileMembersControllerTest < Test::Unit::TestCase login_as :test_user u = create_user('member_wannabe').person - post :add_member, :profile => ent.identifier, :id => u.identifier + post :add_member, :profile => ent.identifier, :id => u.id ent.reload assert_includes ent.members, p @@ -216,7 +216,7 @@ class ProfileMembersControllerTest < Test::Unit::TestCase login_as :test_user u = create_user('member_wannabe').person - post :add_member, :profile => ent.identifier, :id => u.identifier + post :add_member, :profile => ent.identifier, :id => u.id assert_equivalent Profile::Roles.all_roles(ent.environment).compact, u.role_assignments.find_all_by_resource_id(ent.id).map(&:role).compact end -- libgit2 0.21.2