From: Toshi MARUYAMA Date: Wed, 31 Aug 2011 08:45:01 +0000 (+0000) Subject: remove trailing white-spaces from app/controllers/workflows_controller.rb. X-Git-Tag: 1.3.0~1091 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=13d44f9d700704cf9b9ff5fe21ee176f4c8ec2bf;p=redmine.git remove trailing white-spaces from app/controllers/workflows_controller.rb. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6871 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/controllers/workflows_controller.rb b/app/controllers/workflows_controller.rb index 9ca1a98c4..a4c809157 100644 --- a/app/controllers/workflows_controller.rb +++ b/app/controllers/workflows_controller.rb @@ -1,42 +1,42 @@ # Redmine - project management software -# Copyright (C) 2006-2008 Jean-Philippe Lang +# Copyright (C) 2006-2011 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 before_filter :find_roles before_filter :find_trackers - + def index @workflow_counts = Workflow.count_by_tracker_and_role end - + def edit @role = Role.find_by_id(params[:role_id]) - @tracker = Tracker.find_by_id(params[:tracker_id]) - + @tracker = Tracker.find_by_id(params[:tracker_id]) + if request.post? Workflow.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') - @role.workflows.build(:tracker_id => @tracker.id, :old_status_id => status_id, :new_status_id => new_status_id, :author => author, :assignee => assignee) + @role.workflows.build(:tracker_id => @tracker.id, :old_status_id => status_id, :new_status_id => new_status_id, :author => author, :assignee => assignee) } } if @role.save @@ -45,13 +45,13 @@ class WorkflowsController < ApplicationController 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.find(:all, :order => 'position') - + if @tracker && @role && @statuses.any? workflows = Workflow.all(:conditions => {:role_id => @role.id, :tracker_id => @tracker.id}) @workflows = {} @@ -60,9 +60,9 @@ class WorkflowsController < ApplicationController @workflows['assignee'] = workflows.select {|w| w.assignee} end end - + def copy - + if params[:source_tracker_id].blank? || params[:source_tracker_id] == 'any' @source_tracker = nil else @@ -73,10 +73,10 @@ class WorkflowsController < ApplicationController 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) @@ -95,7 +95,7 @@ class WorkflowsController < ApplicationController def find_roles @roles = Role.find(:all, :order => 'builtin, position') end - + def find_trackers @trackers = Tracker.find(:all, :order => 'position') end