From c2b2a9752cf3d212b4d06420e7b89e41505842fc Mon Sep 17 00:00:00 2001 From: Frederico Camara Date: Fri, 29 Jan 2021 13:32:38 -0300 Subject: [PATCH] Change Delete issue button behaviour --- app/views/issues/_action_menu.html.erb | 4 ++-- app/views/issues/show.html.erb | 2 +- config/locales/en.yml | 1 + config/locales/pt-BR.yml | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/views/issues/_action_menu.html.erb b/app/views/issues/_action_menu.html.erb index bd7bcc05f..376c35cab 100644 --- a/app/views/issues/_action_menu.html.erb +++ b/app/views/issues/_action_menu.html.erb @@ -7,7 +7,7 @@ <%= watcher_link(@issue, User.current) %> <%= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'icon icon-copy' if User.current.allowed_to?(:copy_issues, @project) && Issue.allowed_target_projects.any? %> -<%= link_to l(:button_delete), issue_path(@issue), +<%= link_to l(:label_issue_delete), issue_path(@issue), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, - :method => :delete, :class => 'icon icon-del' if @issue.deletable? %> + :method => :delete, :class => 'icon icon-del' if @issue.deletable? if defined? show_delete %> diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 2af6603d5..42e871d78 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -1,4 +1,4 @@ -<%= render :partial => 'action_menu' %> +<%= render :partial => 'action_menu', :locals => {:show_delete => true} %>

<%= issue_heading(@issue) %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index 4b22b59e2..d28518725 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -589,6 +589,7 @@ en: label_project_latest: Latest projects label_issue: Issue label_issue_new: New issue + label_issue_delete: Delete issue label_issue_plural: Issues label_issue_view_all: View all issues label_issues_by: "Issues by %{value}" diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 9fbcfe317..d621b37be 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -360,6 +360,7 @@ pt-BR: label_project_latest: Últimos projetos label_issue: Tarefa label_issue_new: Nova tarefa + label_issue_delete: Excluir tarefa label_issue_plural: Tarefas label_issue_view_all: Ver todas as tarefas label_issues_by: "Tarefas por %{value}" -- 2.25.1