Keep status filter on the projects list when un/archiving a project (#3530).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2806 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 355e1bd..f3280cc 100644 (file)
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -172,12 +172,12 @@ class ProjectsController < ApplicationController
 
   def archive
     @project.archive if request.post? && @project.active?
-    redirect_to :controller => 'admin', :action => 'projects'
+    redirect_to(url_for(:controller => 'admin', :action => 'projects', :status => params[:status]))
   end
   
   def unarchive
     @project.unarchive if request.post? && !@project.active?
-    redirect_to :controller => 'admin', :action => 'projects'
+    redirect_to(url_for(:controller => 'admin', :action => 'projects', :status => params[:status]))
   end
   
   # Delete @project

diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml
index 56aef92..f5226bf 100644 (file)
--- a/app/views/admin/projects.rhtml
+++ b/app/views/admin/projects.rhtml
@@ -31,8 +31,8 @@
        <td align="center"><%= image_tag 'true.png' if project.is_public? %></td>
        <td align="center"><%= format_date(project.created_on) %></td>
   <td class="buttons">
-    <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-lock') if project.active? %>
-    <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project }, :method => :post, :class => 'icon icon-unlock') if !project.active? && (project.parent.nil? || project.parent.active?) %>
+    <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project, :status => params[:status] }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-lock') if project.active? %>
+    <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project, :status => params[:status] }, :method => :post, :class => 'icon icon-unlock') if !project.active? && (project.parent.nil? || project.parent.active?) %>
     <%= link_to(l(:button_copy), { :controller => 'projects', :action => 'copy', :id => project }, :class => 'icon icon-copy') %>
     <%= link_to(l(:button_delete), { :controller => 'projects', :action => 'destroy', :id => project }, :class => 'icon icon-del') %>
   </td>