Remember "Only display used statuses" checkbox value after update.

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

diff --git a/app/controllers/workflows_controller.rb b/app/controllers/workflows_controller.rb
index 7f397bc4ec3456d48ab67be1861bb37780792210..79363566780774bd6b96d0965958d246684c5a55 100644 (file)
--- a/app/controllers/workflows_controller.rb
+++ b/app/controllers/workflows_controller.rb
@@ -38,7 +38,7 @@ class WorkflowsController < ApplicationController
         }
       }
       if @role.save
-        redirect_to :action => 'edit', :role_id => @role, :tracker_id => @tracker
+        redirect_to :action => 'edit', :role_id => @role, :tracker_id => @tracker, :used_statuses_only => params[:used_statuses_only]
         return
       end
     end
@@ -64,7 +64,7 @@ class WorkflowsController < ApplicationController
 
     if request.post? && @role && @tracker
       WorkflowPermission.replace_permissions(@tracker, @role, params[:permissions] || {})
-      redirect_to :action => 'permissions', :role_id => @role, :tracker_id => @tracker
+      redirect_to :action => 'permissions', :role_id => @role, :tracker_id => @tracker, :used_statuses_only => params[:used_statuses_only]
       return
     end
 

diff --git a/app/views/workflows/edit.html.erb b/app/views/workflows/edit.html.erb
index 25034e37967fe5e0fde371aa89aa60a406970fe4..71db6ad4e0c16a0f525ad31f27a23982bb833762 100644 (file)
--- a/app/views/workflows/edit.html.erb
+++ b/app/views/workflows/edit.html.erb
@@ -31,6 +31,7 @@
   <%= form_tag({}, :id => 'workflow_form' ) do %>
     <%= hidden_field_tag 'tracker_id', @tracker.id %>
     <%= hidden_field_tag 'role_id', @role.id %>
+    <%= hidden_field_tag 'used_statuses_only', params[:used_statuses_only] %>
     <div class="autoscroll">
       <%= render :partial => 'form', :locals => {:name => 'always', :workflows => @workflows['always']} %>
 

diff --git a/app/views/workflows/permissions.html.erb b/app/views/workflows/permissions.html.erb
index 2e7c4e0922c8b0f9bd3354edd27fd8dd8031d838..ecfadec0230c92ea03593ce7881b303b6a665e5b 100644 (file)
--- a/app/views/workflows/permissions.html.erb
+++ b/app/views/workflows/permissions.html.erb
@@ -30,6 +30,7 @@
   <%= form_tag({}, :id => 'workflow_form' ) do %>
     <%= hidden_field_tag 'tracker_id', @tracker.id %>
     <%= hidden_field_tag 'role_id', @role.id %>
+    <%= hidden_field_tag 'used_statuses_only', params[:used_statuses_only] %>
     <div class="autoscroll">
     <table class="list fields_permissions">
     <thead>