diff options
| author | Jarka Košanová <jarka@gitlab.com> | 2019-02-13 13:50:24 +0300 |
|---|---|---|
| committer | Jarka Košanová <jarka@gitlab.com> | 2019-02-22 17:20:22 +0300 |
| commit | 7d2c8a02dba9d9e2641ad8e971a60a4d86510c55 (patch) | |
| tree | fc032fa18876b7e80f21ed4265b176e3f98877e6 /app | |
| parent | ce13864265ed3b3f7be6437921bb9773a0cf2fa2 (diff) | |
Remove link after issue move when no permissions
Don't show new issue link after move
when a user does not have permissions
to display the new issue
Diffstat (limited to 'app')
| -rw-r--r-- | app/mailers/emails/issues.rb | 1 | ||||
| -rw-r--r-- | app/views/notify/issue_moved_email.html.haml | 11 | ||||
| -rw-r--r-- | app/views/notify/issue_moved_email.text.erb | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/app/mailers/emails/issues.rb b/app/mailers/emails/issues.rb index 654ae211310..d2e334fb856 100644 --- a/app/mailers/emails/issues.rb +++ b/app/mailers/emails/issues.rb @@ -74,6 +74,7 @@ module Emails @new_issue = new_issue @new_project = new_issue.project + @can_access_project = recipient.can?(:read_project, @new_project) mail_answer_thread(issue, issue_thread_options(updated_by_user.id, recipient.id, reason)) end diff --git a/app/views/notify/issue_moved_email.html.haml b/app/views/notify/issue_moved_email.html.haml index 472c31e9a5e..b766cb1a523 100644 --- a/app/views/notify/issue_moved_email.html.haml +++ b/app/views/notify/issue_moved_email.html.haml @@ -1,6 +1,9 @@ %p Issue was moved to another project. -%p - New issue: - = link_to project_issue_url(@new_project, @new_issue) do - = @new_issue.title +- if @can_access_project + %p + New issue: + = link_to project_issue_url(@new_project, @new_issue) do + = @new_issue.title +- else + You don't have access to the project. diff --git a/app/views/notify/issue_moved_email.text.erb b/app/views/notify/issue_moved_email.text.erb index 66ede43635b..985e689aa9d 100644 --- a/app/views/notify/issue_moved_email.text.erb +++ b/app/views/notify/issue_moved_email.text.erb @@ -1,4 +1,8 @@ Issue was moved to another project. +<% if @can_access_project %> New issue location: <%= project_issue_url(@new_project, @new_issue) %> +<% else %> +You don't have access to the project. +<% end %> |