From e25f8d27255934592aae26251b9ccc0694fb1979 Mon Sep 17 00:00:00 2001 From: ishikawa999 Date: Tue, 4 Jan 2022 01:34:42 +0000 Subject: [PATCH 1/2] Add confirm to delete link --- app/views/projects/settings/_members.html.erb | 2 +- test/functional/projects_controller_test.rb | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb index 6dab1c2940..743e7947e9 100644 --- a/app/views/projects/settings/_members.html.erb +++ b/app/views/projects/settings/_members.html.erb @@ -31,7 +31,7 @@ :class => 'icon icon-edit' %> <%= delete_link membership_path(member), :remote => true, - :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %> + :data => {:confirm => (!User.current.admin? && member.include?(User.current) ? l(:text_own_membership_delete_confirmation) : l(:text_are_you_sure))} if member.deletable? %> <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %> diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb index 705c1a605c..e67e2100dc 100644 --- a/test/functional/projects_controller_test.rb +++ b/test/functional/projects_controller_test.rb @@ -907,6 +907,23 @@ class ProjectsControllerTest < Redmine::ControllerTest assert_select "tr#member-#{member.id}" end + def test_settings_should_show_delete_link_with_confirmation_message + @request.session[:user_id] = 2 + get( + :settings, + :params => { + :id => 'ecookbook', + :tab => 'members' + } + ) + assert_response :success + + # A link for the current user to remove own from the membership + assert_select "tr#member-1 a.icon-del[data-confirm='#{l(:text_own_membership_delete_confirmation)}']" + # A link to remove other user from the membership + assert_select "tr#member-2 a.icon-del[data-confirm='#{l(:text_are_you_sure)}']" + end + def test_settings_should_show_tabs_depending_on_permission @request.session[:user_id] = 3 project = Project.find(1) -- 2.30.2