jro_apps/redmine Commit - r13366:c886ffe200a4

Don't show roles without issue add/edit permission in workflow setup (#15988)....

Jean-Philippe Lang -

r13366:c886ffe200a4

parent child

Context file:

r13366:c886ffe200a4

Collapse all files

app/controllers/workflows_controller.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2014  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
               def index
                 @workflow_counts = WorkflowTransition.count_by_tracker_and_role
               end
               def edit
                 find_trackers_roles_and_statuses_for_edit
                 if request.post? && @roles && @trackers && params[:transitions]
                   transitions = params[:transitions].deep_dup
                   transitions.each do |old_status_id, transitions_by_new_status|
                     transitions_by_new_status.each do |new_status_id, transition_by_rule|
                       transition_by_rule.reject! {|rule, transition| transition == 'no_change'}
                     end
                   end
                   WorkflowTransition.replace_transitions(@trackers, @roles, transitions)
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to_referer_or workflows_edit_path
                   return
                 end
                 if @trackers && @roles && @statuses.any?
                   workflows = WorkflowTransition.where(:role_id => @roles.map(&:id), :tracker_id => @trackers.map(&:id))
                   @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
                 find_trackers_roles_and_statuses_for_edit
                 if request.post? && @roles && @trackers && params[:permissions]
                   permissions = params[:permissions].deep_dup
                   permissions.each { |field, rule_by_status_id|
                     rule_by_status_id.reject! {|status_id, rule| rule == 'no_change'}
                   }
                   WorkflowPermission.replace_permissions(@trackers, @roles, permissions)
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to_referer_or workflows_permissions_path
                   return
                 end
                 if @roles && @trackers
                   @fields = (Tracker::CORE_FIELDS_ALL - @trackers.map(&:disabled_core_fields).reduce(:&)).map {|field| [field, l("field_"+field.sub(/_id$/, ''))]}
                   @custom_fields = @trackers.map(&:custom_fields).flatten.uniq.sort
                   @permissions = WorkflowPermission.rules_by_status_id(@trackers, @roles)
                   @statuses.each {|status| @permissions[status.id] ||= {}}
                 end
               end
               def copy
-                @roles = Role.sorted
+                @roles = Role.sorted.select(&:consider_workflow?)
                 @trackers = Tracker.sorted
                 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.where(:id => params[:target_tracker_ids]).to_a
                 @target_roles = params[:target_role_ids].blank? ?
                     nil : Role.where(:id => params[:target_role_ids]).to_a
                 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.blank? || @target_roles.blank?
                     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 workflows_copy_path(:source_tracker_id => @source_tracker, :source_role_id => @source_role)
                   end
                 end
               end
               private
               def find_trackers_roles_and_statuses_for_edit
                 find_roles
                 find_trackers
                 find_statuses
               end
               def find_roles
                 ids = Array.wrap(params[:role_id])
                 if ids == ['all']
                   @roles = Role.sorted.to_a
                 elsif ids.present?
                   @roles = Role.where(:id => ids).to_a
                 end
                 @roles = nil if @roles.blank?
               end
               def find_trackers
                 ids = Array.wrap(params[:tracker_id])
                 if ids == ['all']
                   @trackers = Tracker.sorted.to_a
                 elsif ids.present?
                   @trackers = Tracker.where(:id => ids).to_a
                 end
                 @trackers = nil if @trackers.blank?
               end
               def find_statuses
                 @used_statuses_only = (params[:used_statuses_only] == '0' ? false : true)
                 if @trackers && @used_statuses_only
                   @statuses = @trackers.map(&:issue_statuses).flatten.uniq.sort.presence
                 end
                 @statuses ||= IssueStatus.sorted.to_a
               end
             end

app/models/workflow_rule.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2014  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 WorkflowRule < ActiveRecord::Base
               self.table_name = "#{table_name_prefix}workflows#{table_name_suffix}"
               belongs_to :role
               belongs_to :tracker
               belongs_to :old_status, :class_name => 'IssueStatus'
               belongs_to :new_status, :class_name => 'IssueStatus'
               validates_presence_of :role, :tracker, :old_status
               attr_protected :id
               # Copies workflows from source to targets
               def self.copy(source_tracker, source_role, target_trackers, target_roles)
                 unless source_tracker.is_a?(Tracker) || source_role.is_a?(Role)
                   raise ArgumentError.new("source_tracker or source_role must be specified")
                 end
                 target_trackers = [target_trackers].flatten.compact
                 target_roles = [target_roles].flatten.compact
                 target_trackers = Tracker.sorted.to_a if target_trackers.empty?
-                target_roles = Role.all if target_roles.empty?
+                target_roles = Role.all.select(&:consider_workflow?) if target_roles.empty?
                 target_trackers.each do |target_tracker|
                   target_roles.each do |target_role|
                     copy_one(source_tracker || target_tracker,
                                source_role || target_role,
                                target_tracker,
                                target_role)
                   end
                 end
               end
               # Copies a single set of workflows from source to target
               def self.copy_one(source_tracker, source_role, target_tracker, target_role)
                 unless source_tracker.is_a?(Tracker) && !source_tracker.new_record? &&
                   source_role.is_a?(Role) && !source_role.new_record? &&
                   target_tracker.is_a?(Tracker) && !target_tracker.new_record? &&
                   target_role.is_a?(Role) && !target_role.new_record?
                   raise ArgumentError.new("arguments can not be nil or unsaved objects")
                 end
                 if source_tracker == target_tracker && source_role == target_role
                   false
                 else
                   transaction do
                     delete_all :tracker_id => target_tracker.id, :role_id => target_role.id
                     connection.insert "INSERT INTO #{WorkflowRule.table_name} (tracker_id, role_id, old_status_id, new_status_id, author, assignee, field_name, #{connection.quote_column_name 'rule'}, type)" +
                                       " SELECT #{target_tracker.id}, #{target_role.id}, old_status_id, new_status_id, author, assignee, field_name, #{connection.quote_column_name 'rule'}, type" +
                                       " FROM #{WorkflowRule.table_name}" +
                                       " WHERE tracker_id = #{source_tracker.id} AND role_id = #{source_role.id}"
                   end
                   true
                 end
               end
             end

app/models/workflow_transition.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2014  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 WorkflowTransition < WorkflowRule
               validates_presence_of :new_status
               # Returns workflow transitions count by tracker and role
               def self.count_by_tracker_and_role
                 counts = connection.select_all("SELECT role_id, tracker_id, count(id) AS c FROM #{table_name} WHERE type = 'WorkflowTransition' GROUP BY role_id, tracker_id")
-                roles    = Role.sorted
+                roles    = Role.sorted.to_a.select(&:consider_workflow?)
                 trackers = Tracker.sorted
                 result = []
                 trackers.each do |tracker|
                   t = []
                   roles.each do |role|
                     row = counts.detect {|c| c['role_id'].to_s == role.id.to_s && c['tracker_id'].to_s == tracker.id.to_s}
                     t << [role, (row.nil? ? 0 : row['c'].to_i)]
                   end
                   result << [tracker, t]
                 end
                 result
               end
               def self.replace_transitions(trackers, roles, transitions)
                 trackers = Array.wrap trackers
                 roles = Array.wrap roles
                 transaction do
                   records = WorkflowTransition.where(:tracker_id => trackers.map(&:id), :role_id => roles.map(&:id)).to_a
                   transitions.each do |old_status_id, transitions_by_new_status|
                     transitions_by_new_status.each do |new_status_id, transition_by_rule|
                       transition_by_rule.each do |rule, transition|
                         trackers.each do |tracker|
                           roles.each do |role|
                             w = records.select {|r|
                               r.old_status_id == old_status_id.to_i &&
                               r.new_status_id == new_status_id.to_i &&
                               r.tracker_id == tracker.id &&
                               r.role_id == role.id &&
                               !r.destroyed?
                             }
                             if rule == 'always'
                               w = w.select {|r| !r.author && !r.assignee}
                             else
                               w = w.select {|r| r.author || r.assignee}
                             end
                             if w.size > 1
                               w[1..-1].each(&:destroy)
                             end
                             w = w.first
                             if transition == "1" || transition == true
                               unless w
                                 w = WorkflowTransition.new(:old_status_id => old_status_id, :new_status_id => new_status_id, :tracker_id => tracker.id, :role_id => role.id)
                                 records << w
                               end
                               w.author = true if rule == "author"
                               w.assignee = true if rule == "assignee"
                               w.save if w.changed?
                             elsif w
                               if rule == 'always'
                                 w.destroy
                               elsif rule == 'author'
                                 if w.assignee
                                   w.author = false
                                   w.save if w.changed?
                                 else
                                   w.destroy
                                 end
                               elsif rule == 'assignee'
                                 if w.author
                                   w.assignee = false
                                   w.save if w.changed?
                                 else
                                   w.destroy
                                 end
                               end
                             end
                           end
                         end
                       end
                     end
                   end
                 end
               end
             end

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

             <%= render :partial => 'action_menu' %>
             <%= title l(:label_workflow) %>
             <div class="tabs">
               <ul>
                 <li><%= link_to l(:label_status_transitions), workflows_edit_path(:role_id => @roles, :tracker_id => @trackers), :class => 'selected' %></li>
                 <li><%= link_to l(:label_fields_permissions), workflows_permissions_path(:role_id => @roles, :tracker_id => @trackers) %></li>
               </ul>
             </div>
             <p><%=l(:text_workflow_edit)%>:</p>
             <%= form_tag({}, :method => 'get') do %>
             <p>
               <label><%=l(:label_role)%>:
-              <%= options_for_workflow_select 'role_id[]', Role.sorted, @roles, :id => 'role_id', :class => 'expandable' %>
+              <%= options_for_workflow_select 'role_id[]', Role.sorted.select(&:consider_workflow?), @roles, :id => 'role_id', :class => 'expandable' %>
               </label>
               <a href="#" data-expands="#role_id"><%= image_tag 'bullet_toggle_plus.png' %></a>
               <label><%=l(:label_tracker)%>:
               <%= options_for_workflow_select 'tracker_id[]', Tracker.sorted, @trackers, :id => 'tracker_id', :class => 'expandable' %>
               </label>
               <a href="#" data-expands="#tracker_id"><%= image_tag 'bullet_toggle_plus.png' %></a>
               <%= submit_tag l(:button_edit), :name => nil %>
               <%= hidden_field_tag 'used_statuses_only', '0', :id => nil %>
               <label><%= check_box_tag 'used_statuses_only', '1', @used_statuses_only %> <%= l(:label_display_used_statuses_only) %></label>
             </p>
             <% end %>
             <% if @trackers && @roles && @statuses.any? %>
               <%= form_tag({}, :id => 'workflow_form' ) do %>
                 <%= @trackers.map {|tracker| hidden_field_tag 'tracker_id[]', tracker.id, :id => nil}.join.html_safe %>
                 <%= @roles.map {|role| hidden_field_tag 'role_id[]', role.id, :id => nil}.join.html_safe %>
                 <%= hidden_field_tag 'used_statuses_only', params[:used_statuses_only], :id => nil %>
                 <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 %>
             <%= javascript_tag do %>
             $("a[data-expands]").click(function(e){
               e.preventDefault();
               var target = $($(this).attr("data-expands"));
               if (target.attr("multiple")) {
                 target.attr("multiple", false);
                 target.find("option[value=all]").show();
               } else {
                 target.attr("multiple", true);
                 target.find("option[value=all]").attr("selected", false).hide();
               }
             });
             <% end %>

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

             <%= render :partial => 'action_menu' %>
             <%= title l(:label_workflow) %>
             <div class="tabs">
               <ul>
                 <li><%= link_to l(:label_status_transitions), workflows_edit_path(:role_id => @roles, :tracker_id => @trackers) %></li>
                 <li><%= link_to l(:label_fields_permissions), workflows_permissions_path(:role_id => @roles, :tracker_id => @trackers), :class => 'selected' %></li>
               </ul>
             </div>
             <p><%=l(:text_workflow_edit)%>:</p>
             <%= form_tag({}, :method => 'get') do %>
             <p>
               <label><%=l(:label_role)%>:
-              <%= options_for_workflow_select 'role_id[]', Role.sorted, @roles, :id => 'role_id', :class => 'expandable' %>
+              <%= options_for_workflow_select 'role_id[]', Role.sorted.select(&:consider_workflow?), @roles, :id => 'role_id', :class => 'expandable' %>
               </label>
               <a href="#" data-expands="#role_id"><%= image_tag 'bullet_toggle_plus.png' %></a>
               <label><%=l(:label_tracker)%>:
               <%= options_for_workflow_select 'tracker_id[]', Tracker.sorted, @trackers, :id => 'tracker_id', :class => 'expandable' %>
               </label>
               <a href="#" data-expands="#tracker_id"><%= image_tag 'bullet_toggle_plus.png' %></a>
               <%= submit_tag l(:button_edit), :name => nil %>
               <%= hidden_field_tag 'used_statuses_only', '0', :id => nil %>
               <label><%= check_box_tag 'used_statuses_only', '1', @used_statuses_only %> <%= l(:label_display_used_statuses_only) %></label>
             </p>
             <% end %>
             <% if @trackers && @roles && @statuses.any? %>
               <%= form_tag({}, :id => 'workflow_form' ) do %>
                 <%= @trackers.map {|tracker| hidden_field_tag 'tracker_id[]', tracker.id, :id => nil}.join.html_safe %>
                 <%= @roles.map {|role| hidden_field_tag 'role_id[]', role.id, :id => nil}.join.html_safe %>
                 <%= hidden_field_tag 'used_statuses_only', params[:used_statuses_only], :id => nil %>
                 <div class="autoscroll">
                 <table class="list workflows fields_permissions">
                 <thead>
                   <tr>
                     <th>
                     </th>
                     <th colspan="<%= @statuses.length %>"><%=l(:label_issue_status)%></th>
                   </tr>
                   <tr>
                     <td></td>
                     <% for status in @statuses %>
                     <td style="width:<%= 75 / @statuses.size %>%;">
                       <%=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 class="name">
                       <%=h name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %>
                     </td>
                     <% for status in @statuses -%>
                     <td class="<%= @permissions[status.id][field] %>">
                       <%= field_permission_tag(@permissions, status, field, @roles) %>
                       <% unless status == @statuses.last %><a href="#" class="repeat-value">&#187;</a><% end %>
                     </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 class="name">
                         <%=h field.name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %>
                       </td>
                       <% for status in @statuses -%>
                       <td class="<%= @permissions[status.id][field.id.to_s] %>">
                         <%= field_permission_tag(@permissions, status, field, @roles) %>
                         <% unless status == @statuses.last %><a href="#" class="repeat-value">&#187;</a><% end %>
                       </td>
                       <% end -%>
                     </tr>
                     <% end %>
                   <% end %>
                 </tbody>
                 </table>
                 </div>
                 <%= submit_tag l(:button_save) %>
               <% end %>
             <% end %>
             <%= javascript_tag do %>
             $("a.repeat-value").click(function(e){
               e.preventDefault();
               var td = $(this).closest('td');
               var selected = td.find("select").find(":selected").val();
               td.nextAll('td').find("select").val(selected);
             });
             $("a[data-expands]").click(function(e){
               e.preventDefault();
               var target = $($(this).attr("data-expands"));
               if (target.attr("multiple")) {
                 target.attr("multiple", false);
                 target.find("option[value=all]").show();
               } else {
                 target.attr("multiple", true);
                 target.find("option[value=all]").attr("selected", false).hide();
               }
             });
             <% 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