diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index bc222a302..9c6265f02 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1358,6 +1358,8 @@ module ApplicationHelper link_to l(:button_delete), url, options end + + def delete_new_link(url, options={}) options = { :method => :delete, diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb index 81aaa4186..d8b75775b 100644 --- a/app/views/projects/settings/_new_members.html.erb +++ b/app/views/projects/settings/_new_members.html.erb @@ -42,13 +42,13 @@ <% end %> - <%# unless member.roles.first.to_s == "Manager"%> + <% unless member.user_id == @project.user_id %> 编辑 <%= delete_link membership_path(member), :remote => true, :class => "c_dblue ml30 fl", :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {confirm: l(:label_delete_confirm)}) if member.deletable? %> - <%# end%> + <% end%> <% end%>