jro_apps/redmine Commit - r9814:072475b8a5bc

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

Jean-Philippe Lang -

r9814:072475b8a5bc

parent child

Context file:

r9814:072475b8a5bc

Collapse all files

app/controllers/workflows_controller.rb +2 -2

             # Redmine - project management software
             # Copyright (C) 2006-2012  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class WorkflowsController < ApplicationController
               layout 'admin'
               before_filter :require_admin, :find_roles, :find_trackers
               def index
                 @workflow_counts = WorkflowTransition.count_by_tracker_and_role
               end
               def edit
                 @role = Role.find_by_id(params[:role_id]) if params[:role_id]
                 @tracker = Tracker.find_by_id(params[:tracker_id]) if params[:tracker_id]
                 if request.post?
                   WorkflowTransition.destroy_all( ["role_id=? and tracker_id=?", @role.id, @tracker.id])
                   (params[:issue_status] || []).each { |status_id, transitions|
                     transitions.each { |new_status_id, options|
                       author = options.is_a?(Array) && options.include?('author') && !options.include?('always')
                       assignee = options.is_a?(Array) && options.include?('assignee') && !options.include?('always')
                       WorkflowTransition.create(:role_id => @role.id, :tracker_id => @tracker.id, :old_status_id => status_id, :new_status_id => new_status_id, :author => author, :assignee => assignee)
                     }
                   }
                   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
                 @used_statuses_only = (params[:used_statuses_only] == '0' ? false : true)
                 if @tracker && @used_statuses_only && @tracker.issue_statuses.any?
                   @statuses = @tracker.issue_statuses
                 end
                 @statuses ||= IssueStatus.sorted.all
                 if @tracker && @role && @statuses.any?
                   workflows = WorkflowTransition.where(:role_id => @role.id, :tracker_id => @tracker.id).all
                   @workflows = {}
                   @workflows['always'] = workflows.select {|w| !w.author && !w.assignee}
                   @workflows['author'] = workflows.select {|w| w.author}
                   @workflows['assignee'] = workflows.select {|w| w.assignee}
                 end
               end
               def permissions
                 @role = Role.find_by_id(params[:role_id]) if params[:role_id]
                 @tracker = Tracker.find_by_id(params[:tracker_id]) if params[:tracker_id]
                 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
                 @used_statuses_only = (params[:used_statuses_only] == '0' ? false : true)
                 if @tracker && @used_statuses_only && @tracker.issue_statuses.any?
                   @statuses = @tracker.issue_statuses
                 end
                 @statuses ||= IssueStatus.sorted.all
                 if @role && @tracker
                   @fields = (Tracker::CORE_FIELDS_ALL - @tracker.disabled_core_fields).map {|field| [field, l("field_"+field.sub(/_id$/, ''))]}
                   @custom_fields = @tracker.custom_fields
                   @permissions = WorkflowPermission.where(:tracker_id => @tracker.id, :role_id => @role.id).all.inject({}) do |h, w|
                     h[w.old_status_id] ||= {}
                     h[w.old_status_id][w.field_name] = w.rule
                     h
                   end
                   @statuses.each {|status| @permissions[status.id] ||= {}}
                 end
               end
               def copy
                 if params[:source_tracker_id].blank? || params[:source_tracker_id] == 'any'
                   @source_tracker = nil
                 else
                   @source_tracker = Tracker.find_by_id(params[:source_tracker_id].to_i)
                 end
                 if params[:source_role_id].blank? || params[:source_role_id] == 'any'
                   @source_role = nil
                 else
                   @source_role = Role.find_by_id(params[:source_role_id].to_i)
                 end
                 @target_trackers = params[:target_tracker_ids].blank? ? nil : Tracker.find_all_by_id(params[:target_tracker_ids])
                 @target_roles = params[:target_role_ids].blank? ? nil : Role.find_all_by_id(params[:target_role_ids])
                 if request.post?
                   if params[:source_tracker_id].blank? || params[:source_role_id].blank? || (@source_tracker.nil? && @source_role.nil?)
                     flash.now[:error] = l(:error_workflow_copy_source)
                   elsif @target_trackers.nil? || @target_roles.nil?
                     flash.now[:error] = l(:error_workflow_copy_target)
                   else
                     WorkflowRule.copy(@source_tracker, @source_role, @target_trackers, @target_roles)
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'copy', :source_tracker_id => @source_tracker, :source_role_id => @source_role
                   end
                 end
               end
               private
               def find_roles
                 @roles = Role.sorted.all
               end
               def find_trackers
                 @trackers = Tracker.sorted.all
               end
             end

app/views/workflows/edit.html.erb +1 0

             <%= render :partial => 'action_menu' %>
             <h2><%=l(:label_workflow)%></h2>
             <div class="tabs">
               <ul>
                 <li><%= link_to l(:label_status_transitions), {:action => 'edit', :role_id => @role, :tracker_id => @tracker}, :class => 'selected' %></li>
                 <li><%= link_to l(:label_fields_permissions), {:action => 'permissions', :role_id => @role, :tracker_id => @tracker} %></li>
               </ul>
             </div>
             <p><%=l(:text_workflow_edit)%>:</p>
             <%= form_tag({}, :method => 'get') do %>
             <p>
               <label><%=l(:label_role)%>:
               <%= select_tag 'role_id', options_from_collection_for_select(@roles, "id", "name", @role && @role.id) %></label>
               <label><%=l(:label_tracker)%>:
               <%= select_tag 'tracker_id', options_from_collection_for_select(@trackers, "id", "name", @tracker && @tracker.id) %></label>
               <%= submit_tag l(:button_edit), :name => nil %>
               <%= hidden_field_tag 'used_statuses_only', '0' %>
               <label><%= check_box_tag 'used_statuses_only', '1', @used_statuses_only %> <%= l(:label_display_used_statuses_only) %></label>
             </p>
             <% end %>
             <% if @tracker && @role && @statuses.any? %>
               <%= 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']} %>
                   <fieldset class="collapsible" style="padding: 0; margin-top: 0.5em;">
                     <legend onclick="toggleFieldset(this);"><%= l(:label_additional_workflow_transitions_for_author) %></legend>
                     <div id="author_workflows" style="margin: 0.5em 0 0.5em 0;">
                       <%= render :partial => 'form', :locals => {:name => 'author', :workflows => @workflows['author']} %>
                     </div>
                   </fieldset>
                   <%= javascript_tag "hideFieldset($('author_workflows'))" unless @workflows['author'].present? %>
                   <fieldset class="collapsible" style="padding: 0;">
                     <legend onclick="toggleFieldset(this);"><%= l(:label_additional_workflow_transitions_for_assignee) %></legend>
                     <div id="assignee_workflows" style="margin: 0.5em 0 0.5em 0;">
                   <%= render :partial => 'form', :locals => {:name => 'assignee', :workflows => @workflows['assignee']} %>
                     </div>
                   </fieldset>
                   <%= javascript_tag "hideFieldset($('assignee_workflows'))" unless @workflows['assignee'].present? %>
                 </div>
                 <%= submit_tag l(:button_save) %>
               <% end %>
             <% end %>
             <% html_title(l(:label_workflow)) -%>

app/views/workflows/permissions.html.erb +1 0

             <%= render :partial => 'action_menu' %>
             <h2><%=l(:label_workflow)%></h2>
             <div class="tabs">
               <ul>
                 <li><%= link_to l(:label_status_transitions), {:action => 'edit', :role_id => @role, :tracker_id => @tracker} %></li>
                 <li><%= link_to l(:label_fields_permissions), {:action => 'permissions', :role_id => @role, :tracker_id => @tracker}, :class => 'selected' %></li>
               </ul>
             </div>
             <p><%=l(:text_workflow_edit)%>:</p>
             <%= form_tag({}, :method => 'get') do %>
             <p>
               <label><%=l(:label_role)%>:
               <%= select_tag 'role_id', options_from_collection_for_select(@roles, "id", "name", @role && @role.id) %></label>
               <label><%=l(:label_tracker)%>:
               <%= select_tag 'tracker_id', options_from_collection_for_select(@trackers, "id", "name", @tracker && @tracker.id) %></label>
               <%= submit_tag l(:button_edit), :name => nil %>
               <%= hidden_field_tag 'used_statuses_only', '0' %>
               <label><%= check_box_tag 'used_statuses_only', '1', @used_statuses_only %> <%= l(:label_display_used_statuses_only) %></label>
             </p>
             <% end %>
             <% if @tracker && @role && @statuses.any? %>
               <%= 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>
                   <tr>
                     <th align="left">
                     </th>
                     <th align="center" colspan="<%= @statuses.length %>"><%=l(:label_issue_status)%></th>
                   </tr>
                   <tr>
                     <td></td>
                     <% for status in @statuses %>
                     <td width="<%= 75 / @statuses.size %>%" align="center">
                       <%=h status.name %>
                     </td>
                     <% end %>
                   </tr>
                 </thead>
                 <tbody>
                   <tr class="group open">
                     <td colspan="<%= @statuses.size + 1 %>">
                       <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
                       <%= l(:field_core_fields) %>
                     </td>
                   </tr>
                   <% @fields.each do |field, name| %>
                   <tr class="<%= cycle("odd", "even") %>">
                     <td>
                       <%=h name %>
                     </td>
                     <% for status in @statuses -%>
                     <td align="center" class="<%= @permissions[status.id][field] %>">
                       <%= field_permission_tag(@permissions, status, field) %>
                     </td>
                     <% end -%>
                   </tr>
                   <% end %>
                   <% if @custom_fields.any? %>
                     <tr class="group open">
                       <td colspan="<%= @statuses.size + 1 %>">
                         <span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
                         <%= l(:label_custom_field_plural) %>
                       </td>
                     </tr>
                     <% @custom_fields.each do |field| %>
                     <tr class="<%= cycle("odd", "even") %>">
                       <td>
                         <%=h field.name %>
                       </td>
                       <% for status in @statuses -%>
                       <td align="center" class="<%= @permissions[status.id][field.id.to_s] %>">
                         <%= field_permission_tag(@permissions, status, field) %>
                       </td>
                       <% end -%>
                     </tr>
                     <% end %>
                   <% end %>
                 </tbody>
                 </table>
                 </div>
                 <%= submit_tag l(:button_save) %>
               <% end %>
             <% end %>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages