jro_apps/redmine Commit - r4216:1ee7954f44d6

Merged r4292 from trunk....

Eric Davis -

r4216:1ee7954f44d6

parent child

Context file:

r4216:1ee7954f44d6

Collapse all files

app/controllers/issue_moves_controller.rb +3 0

             class IssueMovesController < ApplicationController
               default_search_scope :issues
               before_filter :find_issues
               before_filter :authorize
               def new
                 prepare_for_issue_move
                 render :layout => false if request.xhr?
               end
               def create
                 prepare_for_issue_move
                 if request.post?
                   new_tracker = params[:new_tracker_id].blank? ? nil : @target_project.trackers.find_by_id(params[:new_tracker_id])
                   unsaved_issue_ids = []
                   moved_issues = []
                   @issues.each do |issue|
                     issue.reload
                     issue.init_journal(User.current)
+                    issue.current_journal.notes = @notes if @notes.present?
                     call_hook(:controller_issues_move_before_save, { :params => params, :issue => issue, :target_project => @target_project, :copy => !!@copy })
                     if r = issue.move_to_project(@target_project, new_tracker, {:copy => @copy, :attributes => extract_changed_attributes_for_move(params)})
                       moved_issues << r
                     else
                       unsaved_issue_ids << issue.id
                     end
                   end
                   set_flash_from_bulk_issue_save(@issues, unsaved_issue_ids)
                   if params[:follow]
                     if @issues.size == 1 && moved_issues.size == 1
                       redirect_to :controller => 'issues', :action => 'show', :id => moved_issues.first
                     else
                       redirect_to :controller => 'issues', :action => 'index', :project_id => (@target_project || @project)
                     end
                   else
                     redirect_to :controller => 'issues', :action => 'index', :project_id => @project
                   end
                   return
                 end
               end
               private
               def prepare_for_issue_move
                 @issues.sort!
                 @copy = params[:copy_options] && params[:copy_options][:copy]
                 @allowed_projects = Issue.allowed_target_projects_on_move
                 @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
                 @target_project ||= @project
                 @trackers = @target_project.trackers
                 @available_statuses = Workflow.available_statuses(@project)
+                @notes = params[:notes]
+                @notes ||= ''
               end
               def extract_changed_attributes_for_move(params)
                 changed_attributes = {}
                 [:assigned_to_id, :status_id, :start_date, :due_date, :priority_id].each do |valid_attribute|
                   unless params[valid_attribute].blank?
                     changed_attributes[valid_attribute] = (params[valid_attribute] == 'none' ? nil : params[valid_attribute])
                   end
                 end
                 changed_attributes
               end
             end

app/views/issue_moves/new.rhtml +5 0

             <h2><%= @copy ? l(:button_copy) : l(:button_move) %></h2>
             <ul>
             <% @issues.each do |issue| -%>
             	<li><%= link_to_issue issue %></li>
             <% end -%>
             </ul>
             <% form_tag({:action => 'create'}, :id => 'move_form') do %>
             <%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join %>
             <div class="box tabular">
             <p><label for="new_project_id"><%=l(:field_project)%>:</label>
             <%= select_tag "new_project_id",
                            project_tree_options_for_select(@allowed_projects, :selected => @target_project),
                            :onchange => remote_function(:url => { :action => 'new' },
                                                         :method => :get,
                                                         :update => 'content',
                                                         :with => "Form.serialize('move_form')") %></p>
             <p><label for="new_tracker_id"><%=l(:field_tracker)%>:</label>
             <%= select_tag "new_tracker_id", "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@trackers, "id", "name") %></p>
             <p>
               <label><%= l(:field_assigned_to) %></label>
               <%= select_tag('assigned_to_id', content_tag('option', l(:label_no_change_option), :value => '') +
                                                content_tag('option', l(:label_nobody), :value => 'none') +
                                                options_from_collection_for_select(@target_project.assignable_users, :id, :name)) %>
             </p>
             <p>
               <label><%= l(:field_status) %></label>
               <%= select_tag('status_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_statuses, :id, :name)) %>
             </p>
             <p>
               <label><%= l(:field_priority) %></label>
               <%= select_tag('priority_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(IssuePriority.all, :id, :name)) %>
             </p>
             <p>
               <label><%= l(:field_start_date) %></label>
               <%= text_field_tag 'start_date', '', :size => 10 %><%= calendar_for('start_date') %>
             </p>
             <p>
               <label><%= l(:field_due_date) %></label>
               <%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %>
             </p>
+            <fieldset><legend><%= l(:field_notes) %></legend>
+            <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>
+            <%= wikitoolbar_for 'notes' %>
+            </fieldset>
             <%= call_hook(:view_issues_move_bottom, :issues => @issues, :target_project => @target_project, :copy => !!@copy) %>
             </div>
             <% if @copy %>
             	<%= hidden_field_tag("copy_options[copy]", "1") %>
             	<%= submit_tag l(:button_copy) %>
             	<%= submit_tag l(:button_copy_and_follow), :name => 'follow' %>
             <% else %>
             	<%= submit_tag l(:button_move) %>
             	<%= submit_tag l(:button_move_and_follow), :name => 'follow' %>
             <% end %>
             <% end %>

test/functional/issue_moves_controller_test.rb +13 -1

             require File.dirname(__FILE__) + '/../test_helper'
             class IssueMovesControllerTest < ActionController::TestCase
               fixtures :all
               def setup
                 User.current = nil
               end
               def test_create_one_issue_to_another_project
                 @request.session[:user_id] = 2
                 post :create, :id => 1, :new_project_id => 2, :tracker_id => '', :assigned_to_id => '', :status_id => '', :start_date => '', :due_date => ''
                 assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook'
                 assert_equal 2, Issue.find(1).project_id
               end
               def test_create_one_issue_to_another_project_should_follow_when_needed
                 @request.session[:user_id] = 2
                 post :create, :id => 1, :new_project_id => 2, :follow => '1'
                 assert_redirected_to '/issues/1'
               end
               def test_bulk_create_to_another_project
                 @request.session[:user_id] = 2
                 post :create, :ids => [1, 2], :new_project_id => 2
                 assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook'
                 # Issues moved to project 2
                 assert_equal 2, Issue.find(1).project_id
                 assert_equal 2, Issue.find(2).project_id
                 # No tracker change
                 assert_equal 1, Issue.find(1).tracker_id
                 assert_equal 2, Issue.find(2).tracker_id
               end
               def test_bulk_create_to_another_tracker
                 @request.session[:user_id] = 2
                 post :create, :ids => [1, 2], :new_tracker_id => 2
                 assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook'
                 assert_equal 2, Issue.find(1).tracker_id
                 assert_equal 2, Issue.find(2).tracker_id
               end
               context "#create via bulk move" do
-                should "allow changing the issue priority" do
+                setup do
                   @request.session[:user_id] = 2
+                end
+                should "allow changing the issue priority" do
                   post :create, :ids => [1, 2], :priority_id => 6
                   assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook'
                   assert_equal 6, Issue.find(1).priority_id
                   assert_equal 6, Issue.find(2).priority_id
                 end
+                should "allow adding a note when moving" do
+                  post :create, :ids => [1, 2], :notes => 'Moving two issues'
+                  assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook'
+                  assert_equal 'Moving two issues', Issue.find(1).journals.last.notes
+                  assert_equal 'Moving two issues', Issue.find(2).journals.last.notes
+                end
               end
               def test_bulk_copy_to_another_project
                 @request.session[:user_id] = 2
                 assert_difference 'Issue.count', 2 do
                   assert_no_difference 'Project.find(1).issues.count' do
                     post :create, :ids => [1, 2], :new_project_id => 2, :copy_options => {:copy => '1'}
                   end
                 end
                 assert_redirected_to 'projects/ecookbook/issues'
               end
               context "#create via bulk copy" do
                 should "allow not changing the issue's attributes" do
                   @request.session[:user_id] = 2
                   issue_before_move = Issue.find(1)
                   assert_difference 'Issue.count', 1 do
                     assert_no_difference 'Project.find(1).issues.count' do
                       post :create, :ids => [1], :new_project_id => 2, :copy_options => {:copy => '1'}, :new_tracker_id => '', :assigned_to_id => '', :status_id => '', :start_date => '', :due_date => ''
                     end
                   end
                   issue_after_move = Issue.first(:order => 'id desc', :conditions => {:project_id => 2})
                   assert_equal issue_before_move.tracker_id, issue_after_move.tracker_id
                   assert_equal issue_before_move.status_id, issue_after_move.status_id
                   assert_equal issue_before_move.assigned_to_id, issue_after_move.assigned_to_id
                 end
                 should "allow changing the issue's attributes" do
                   # Fixes random test failure with Mysql
                   # where Issue.all(:limit => 2, :order => 'id desc', :conditions => {:project_id => 2}) doesn't return the expected results
                   Issue.delete_all("project_id=2")
                   @request.session[:user_id] = 2
                   assert_difference 'Issue.count', 2 do
                     assert_no_difference 'Project.find(1).issues.count' do
                       post :create, :ids => [1, 2], :new_project_id => 2, :copy_options => {:copy => '1'}, :new_tracker_id => '', :assigned_to_id => 4, :status_id => 3, :start_date => '2009-12-01', :due_date => '2009-12-31'
                     end
                   end
                   copied_issues = Issue.all(:limit => 2, :order => 'id desc', :conditions => {:project_id => 2})
                   assert_equal 2, copied_issues.size
                   copied_issues.each do |issue|
                     assert_equal 2, issue.project_id, "Project is incorrect"
                     assert_equal 4, issue.assigned_to_id, "Assigned to is incorrect"
                     assert_equal 3, issue.status_id, "Status is incorrect"
                     assert_equal '2009-12-01', issue.start_date.to_s, "Start date is incorrect"
                     assert_equal '2009-12-31', issue.due_date.to_s, "Due date is incorrect"
                   end
                 end
               end
               def test_copy_to_another_project_should_follow_when_needed
                 @request.session[:user_id] = 2
                 post :create, :ids => [1], :new_project_id => 2, :copy_options => {:copy => '1'}, :follow => '1'
                 issue = Issue.first(:order => 'id DESC')
                 assert_redirected_to :controller => 'issues', :action => 'show', :id => issue
               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