diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-07-04 13:14:28 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-07-04 13:14:28 +0000 |
| commit | 937823a0d849650c9ecad76d2c5c7b69a93b0856 (patch) | |
| tree | c8e868201583c12389a235ab314d2ef9f0014a33 | |
| parent | ef8ef596de8f1d82e0b001cc85dea0d1ca568878 (diff) | |
| download | redmine-937823a0d849650c9ecad76d2c5c7b69a93b0856.tar.gz redmine-937823a0d849650c9ecad76d2c5c7b69a93b0856.zip | |
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
| -rw-r--r-- | app/controllers/projects_controller.rb | 4 | ||||
| -rw-r--r-- | app/views/admin/projects.rhtml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 355e1bd46..f3280cc23 100644 --- 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 56aef92ed..f5226bf5d 100644 --- 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> |