From 65e05d822acd6d9cd4cd77ac83e885cba2e52a3c Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Fri, 12 Oct 2007 15:55:06 +0000 Subject: [PATCH] Status can now be updated when bulk editing issues. Workflow permissions are applied as when changing the status of a single issue. The issue is not saved (and an error is displayed) if the status transition is not allowed for the user. git-svn-id: http://redmine.rubyforge.org/svn/trunk@831 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/projects_controller.rb | 12 ++++++++++-- app/models/issue_status.rb | 6 ++++++ app/views/issues/_bulk_edit_form.rhtml | 10 ++++++++-- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 6e6659de7..5fcd3ce9c 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -340,12 +340,13 @@ class ProjectsController < ApplicationController # Bulk edit issues def bulk_edit_issues if request.post? + status = IssueStatus.find_by_id(params[:status_id]) priority = Enumeration.find_by_id(params[:priority_id]) assigned_to = User.find_by_id(params[:assigned_to_id]) category = @project.issue_categories.find_by_id(params[:category_id]) fixed_version = @project.versions.find_by_id(params[:fixed_version_id]) issues = @project.issues.find_all_by_id(params[:issue_ids]) - unsaved_issue_ids = [] + unsaved_issue_ids = [] issues.each do |issue| journal = issue.init_journal(User.current, params[:notes]) issue.priority = priority if priority @@ -355,10 +356,12 @@ class ProjectsController < ApplicationController issue.start_date = params[:start_date] unless params[:start_date].blank? issue.due_date = params[:due_date] unless params[:due_date].blank? issue.done_ratio = params[:done_ratio] unless params[:done_ratio].blank? - if issue.save + # Don't save any change to the issue if the user is not authorized to apply the requested status + if (status.nil? || (issue.status.new_status_allowed_to?(status, current_role, issue.tracker) && issue.status = status)) && issue.save # Send notification for each issue (if changed) Mailer.deliver_issue_edit(journal) if journal.details.any? && Setting.notified_events.include?('issue_updated') else + # Keep unsaved issue ids to display them in flash error unsaved_issue_ids << issue.id end end @@ -370,6 +373,11 @@ class ProjectsController < ApplicationController redirect_to :action => 'list_issues', :id => @project return end + if current_role && User.current.allowed_to?(:change_issue_status, @project) + # Find potential statuses the user could be allowed to switch issues to + @available_statuses = Workflow.find(:all, :include => :new_status, + :conditions => {:role_id => current_role.id}).collect(&:new_status).compact.uniq + end render :update do |page| page.hide 'query_form' page.replace_html 'bulk-edit', :partial => 'issues/bulk_edit_form' diff --git a/app/models/issue_status.rb b/app/models/issue_status.rb index 3929c6774..62b2cb762 100644 --- a/app/models/issue_status.rb +++ b/app/models/issue_status.rb @@ -51,6 +51,12 @@ class IssueStatus < ActiveRecord::Base :conditions => ["role_id=? and tracker_id=?", role.id, tracker.id]).collect{ |w| w.new_status }.compact if role && tracker new_statuses ? new_statuses.sort{|x, y| x.position <=> y.position } : [] end + + def new_status_allowed_to?(status, role, tracker) + status && role && tracker ? + !workflows.find(:first, :conditions => {:new_status_id => status.id, :role_id => role.id, :tracker_id => tracker.id}).nil? : + false + end def to_s; name end diff --git a/app/views/issues/_bulk_edit_form.rhtml b/app/views/issues/_bulk_edit_form.rhtml index 3824d9c05..a98c1f399 100644 --- a/app/views/issues/_bulk_edit_form.rhtml +++ b/app/views/issues/_bulk_edit_form.rhtml @@ -2,12 +2,18 @@
<%= l(:label_bulk_edit_selected_issues) %>

+<% if @available_statuses %> + +<% end %> - +

+

+

-- 2.39.5