diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index a2624031b..a45b3463c 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -235,7 +235,7 @@ class ProjectsController < ApplicationController unless @project.archive flash[:error] = l(:error_can_not_archive_project) end - redirect_to_referer_or admin_projects_path(:status => params[:status]) + redirect_to admin_projects_path(:status => params[:status]) end def unarchive diff --git a/app/views/projects/destroy.html.erb b/app/views/projects/destroy.html.erb index f2c97449b..6722365ad 100644 --- a/app/views/projects/destroy.html.erb +++ b/app/views/projects/destroy.html.erb @@ -26,6 +26,9 @@

<%= submit_tag l(:button_delete) %> + <% if User.current.admin? and !@project_to_destroy.archived? %> + <%= link_to l(:button_archive), archive_project_path(@project_to_destroy), method: :post, class: 'btn' %> + <% end %> <%= link_to l(:button_cancel), User.current.admin? ? admin_projects_path : projects_path %>

<% end %>