jro_apps/redmine Commit - r8411:81cf6b234397

Allows project to be changed from the regular issue update action (#4769, #9803)....

Jean-Philippe Lang -

r8411:81cf6b234397

parent child

Context file:

r8411:81cf6b234397

Collapse all files

app/controllers/issues_controller.rb +12 -2

               def new
                 respond_to do |format|
                   format.html { render :action => 'new', :layout => !request.xhr? }
-                  format.js { render :partial => 'attributes' }
+                  format.js {
+                    render(:update) { |page|
+                      if params[:project_change]
+                        page.replace_html 'all_attributes', :partial => 'form'
+                      else
+                        page.replace_html 'attributes', :partial => 'attributes'
+                      end
+                      m = User.current.allowed_to?(:log_time, @issue.project) ? 'show' : 'hide'
+                      page << "if ($('log_time')) {Element.#{m}('log_time');}"
+                    }
+                  }
                 end
               end
               end
               def find_project
-                project_id = (params[:issue] && params[:issue][:project_id]) || params[:project_id]
+                project_id = params[:project_id] || (params[:issue] && params[:issue][:project_id])
                 @project = Project.find(project_id)
               rescue ActiveRecord::RecordNotFound
                 render_404

app/models/issue.rb +36 -10

                 issue.init_journal(User.current, options[:notes])
-                issue.project = new_project
+                # Preserve previous behaviour
+                # #move_to_project doesn't change tracker automatically
+                issue.send :project=, new_project, true
                 if new_tracker
                   issue.tracker = new_tracker
                 end
                 write_attribute(:priority_id, pid)
               end
+              def category_id=(cid)
+                self.category = nil
+                write_attribute(:category_id, cid)
+              end
+              def fixed_version_id=(vid)
+                self.fixed_version = nil
+                write_attribute(:fixed_version_id, vid)
+              end
               def tracker_id=(tid)
                 self.tracker = nil
                 result = write_attribute(:tracker_id, tid)
                 end
               end
-              def project=(project)
+              def project=(project, keep_tracker=false)
                 project_was = self.project
                 write_attribute(:project_id, project ? project.id : nil)
                 association_instance_set('project', project)
                 if project_was && project && project_was != project
+                  unless keep_tracker || project.trackers.include?(tracker)
+                    self.tracker = project.trackers.first
+                  end
                   # Reassign to the category with same name if any
                   if category
                     self.category = project.issue_categories.find_by_name(category.name)
                 write_attribute :estimated_hours, (h.is_a?(String) ? h.to_hours : h)
               end
+              safe_attributes 'project_id',
+                :if => lambda {|issue, user|
+                  projects = Issue.allowed_target_projects_on_move(user)
+                  projects.include?(issue.project) && projects.size > 1
+                }
               safe_attributes 'tracker_id',
                 'status_id',
                 'category_id',
                 attrs = delete_unsafe_attributes(attrs, user)
                 return if attrs.empty?
-                # Tracker must be set before since new_statuses_allowed_to depends on it.
+                # Project and Tracker must be set before since new_statuses_allowed_to depends on it.
+                if p = attrs.delete('project_id')
+                  self.project_id = p
+                end
                 if t = attrs.delete('tracker_id')
                   self.tracker_id = t
                 end
               # End ReportsController extraction
               # Returns an array of projects that current user can move issues to
-              def self.allowed_target_projects_on_move
+              def self.allowed_target_projects_on_move(user=User.current)
                 projects = []
-                if User.current.admin?
+                if user.admin?
                   # admin is allowed to move issues to any active (visible) project
-                  projects = Project.visible.all
+                  projects = Project.visible(user).all
-                elsif User.current.logged?
+                elsif user.logged?
                   if Role.non_member.allowed_to?(:move_issues)
-                    projects = Project.visible.all
+                    projects = Project.visible(user).all
                   else
-                    User.current.memberships.each {|m| projects << m.project if m.roles.detect {|r| r.allowed_to?(:move_issues)}}
+                    user.memberships.each {|m| projects << m.project if m.roles.detect {|r| r.allowed_to?(:move_issues)}}
                   end
                 end
                 projects
                 # Move subtasks
                 children.each do |child|
-                  child.project = project
+                  # Change project and keep project
+                  child.send :project=, project, true
                   unless child.save
                     raise ActiveRecord::Rollback
                   end

app/views/issues/_attributes.html.erb +7 -7

             <p><%= f.select :assigned_to_id, principals_options_for_select(@issue.assignable_users, @issue.assigned_to), :include_blank => true %></p>
             <% end %>
-            <% if @issue.safe_attribute?('category_id') && @project.issue_categories.any? %>
+            <% if @issue.safe_attribute?('category_id') && @issue.project.issue_categories.any? %>
-            <p><%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %>
+            <p><%= f.select :category_id, (@issue.project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %>
             <%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'),
                                  l(:label_issue_category_new),
                                  'issue_category[name]',
-                                 {:controller => 'issue_categories', :action => 'create', :project_id => @project},
+                                 {:controller => 'issue_categories', :action => 'create', :project_id => @issue.project},
                                  :title => l(:label_issue_category_new),
-                                 :tabindex => 199) if authorize_for('issue_categories', 'new') %></p>
+                                 :tabindex => 199) if User.current.allowed_to?(:manage_categories, @issue.project) %></p>
             <% end %>
             <% if @issue.safe_attribute?('fixed_version_id') && @issue.assignable_versions.any? %>
             <%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'),
                                  l(:label_version_new),
                                  'version[name]',
-                                 {:controller => 'versions', :action => 'create', :project_id => @project},
+                                 {:controller => 'versions', :action => 'create', :project_id => @issue.project},
                                  :title => l(:label_version_new),
-                                 :tabindex => 200) if authorize_for('versions', 'new') %>
+                                 :tabindex => 200) if User.current.allowed_to?(:manage_versions, @issue.project) %>
             </p>
             <% end %>
             </div>
             <% if @issue.safe_attribute? 'parent_issue_id' %>
             <p id="parent_issue"><%= f.text_field :parent_issue_id, :size => 10 %></p>
             <div id="parent_issue_candidates" class="autocomplete"></div>
-            <%= javascript_tag "observeParentIssueField('#{auto_complete_issues_path(:id => @issue, :project_id => @project) }')" %>
+            <%= javascript_tag "observeParentIssueField('#{auto_complete_issues_path(:id => @issue, :project_id => @issue.project) }')" %>
             <% end %>
             <% if @issue.safe_attribute? 'start_date' %>

app/views/issues/_edit.html.erb +2 0

                 <div class="box">
                 <% if @edit_allowed || !@allowed_statuses.empty? %>
                     <fieldset class="tabular"><legend><%= l(:label_change_properties) %></legend>
+            				<div id="all_attributes">
                     <%= render :partial => 'form', :locals => {:f => f} %>
+            				</div>
                     </fieldset>
                 <% end %>
                 <% if User.current.allowed_to?(:log_time, @project) %>

app/views/issues/_form.html.erb +9 -2

+            <% labelled_fields_for :issue, @issue do |f| %>
             <%= call_hook(:view_issues_form_details_top, { :issue => @issue, :form => f }) %>
             <% if @issue.safe_attribute? 'is_private' %>
             </p>
             <% end %>
+            <% if !@issue.new_record? && @issue.safe_attribute?('project_id') %>
+            <p><%= f.select :project_id, Issue.allowed_target_projects_on_move.collect {|t| [t.name, t.id]}, :required => true %></p>
+            <%= observe_field :issue_project_id, :url => project_issue_form_path(@project, :id => @issue, :project_change => '1'),
+                                                 :with => "Form.serialize('issue-form')" %>
+            <% end %>
             <% if @issue.safe_attribute? 'tracker_id' %>
-            <p><%= f.select :tracker_id, @project.trackers.collect {|t| [t.name, t.id]}, :required => true %></p>
+            <p><%= f.select :tracker_id, @issue.project.trackers.collect {|t| [t.name, t.id]}, :required => true %></p>
             <%= observe_field :issue_tracker_id, :url => project_issue_form_path(@project, :id => @issue),
-                                                 :update => :attributes,
                                                  :with => "Form.serialize('issue-form')" %>
             <% end %>
             </div>
             <%= call_hook(:view_issues_form_details_bottom, { :issue => @issue, :form => f }) %>
+            <% end %>

test/fixtures/roles.yml 0 -1

                 - :edit_issues
                 - :manage_issue_relations
                 - :add_issue_notes
-                - :move_issues
                 - :save_queries
                 - :view_gantt
                 - :view_calendar

test/functional/issues_controller_test.rb +78 -1

@@ -721,6 +721,7 class IssuesControllerTest < ActionController::TestCase
721		721
722	assert_tag 'form', :attributes => {:id => 'issue-form'}	722	assert_tag 'form', :attributes => {:id => 'issue-form'}
723	assert_tag 'input', :attributes => {:name => 'issue[is_private]'}	723	assert_tag 'input', :attributes => {:name => 'issue[is_private]'}
		724	assert_tag 'select', :attributes => {:name => 'issue[project_id]'}
724	assert_tag 'select', :attributes => {:name => 'issue[tracker_id]'}	725	assert_tag 'select', :attributes => {:name => 'issue[tracker_id]'}
725	assert_tag 'input', :attributes => {:name => 'issue[subject]'}	726	assert_tag 'input', :attributes => {:name => 'issue[subject]'}
726	assert_tag 'textarea', :attributes => {:name => 'issue[description]'}	727	assert_tag 'textarea', :attributes => {:name => 'issue[description]'}
@@ -748,6 +749,7 class IssuesControllerTest < ActionController::TestCase
748		749
749	assert_tag 'form', :attributes => {:id => 'issue-form'}	750	assert_tag 'form', :attributes => {:id => 'issue-form'}
750	assert_no_tag 'input', :attributes => {:name => 'issue[is_private]'}	751	assert_no_tag 'input', :attributes => {:name => 'issue[is_private]'}
		752	assert_no_tag 'select', :attributes => {:name => 'issue[project_id]'}
751	assert_no_tag 'select', :attributes => {:name => 'issue[tracker_id]'}	753	assert_no_tag 'select', :attributes => {:name => 'issue[tracker_id]'}
752	assert_no_tag 'input', :attributes => {:name => 'issue[subject]'}	754	assert_no_tag 'input', :attributes => {:name => 'issue[subject]'}
753	assert_no_tag 'textarea', :attributes => {:name => 'issue[description]'}	755	assert_no_tag 'textarea', :attributes => {:name => 'issue[description]'}
@@ -774,6 +776,7 class IssuesControllerTest < ActionController::TestCase
774		776
775	assert_tag 'form', :attributes => {:id => 'issue-form'}	777	assert_tag 'form', :attributes => {:id => 'issue-form'}
776	assert_no_tag 'input', :attributes => {:name => 'issue[is_private]'}	778	assert_no_tag 'input', :attributes => {:name => 'issue[is_private]'}
		779	assert_no_tag 'select', :attributes => {:name => 'issue[project_id]'}
777	assert_no_tag 'select', :attributes => {:name => 'issue[tracker_id]'}	780	assert_no_tag 'select', :attributes => {:name => 'issue[tracker_id]'}
778	assert_no_tag 'input', :attributes => {:name => 'issue[subject]'}	781	assert_no_tag 'input', :attributes => {:name => 'issue[subject]'}
779	assert_no_tag 'textarea', :attributes => {:name => 'issue[description]'}	782	assert_no_tag 'textarea', :attributes => {:name => 'issue[description]'}
@@ -1014,6 +1017,7 class IssuesControllerTest < ActionController::TestCase
1014	assert_template 'new'	1017	assert_template 'new'
1015		1018
1016	assert_tag 'input', :attributes => {:name => 'issue[is_private]'}	1019	assert_tag 'input', :attributes => {:name => 'issue[is_private]'}
		1020	assert_no_tag 'select', :attributes => {:name => 'issue[project_id]'}
1017	assert_tag 'select', :attributes => {:name => 'issue[tracker_id]'}	1021	assert_tag 'select', :attributes => {:name => 'issue[tracker_id]'}
1018	assert_tag 'input', :attributes => {:name => 'issue[subject]'}	1022	assert_tag 'input', :attributes => {:name => 'issue[subject]'}
1019	assert_tag 'textarea', :attributes => {:name => 'issue[description]'}	1023	assert_tag 'textarea', :attributes => {:name => 'issue[description]'}
@@ -1045,6 +1049,7 class IssuesControllerTest < ActionController::TestCase
1045	assert_template 'new'	1049	assert_template 'new'
1046		1050
1047	assert_no_tag 'input', :attributes => {:name => 'issue[is_private]'}	1051	assert_no_tag 'input', :attributes => {:name => 'issue[is_private]'}
		1052	assert_no_tag 'select', :attributes => {:name => 'issue[project_id]'}
1048	assert_tag 'select', :attributes => {:name => 'issue[tracker_id]'}	1053	assert_tag 'select', :attributes => {:name => 'issue[tracker_id]'}
1049	assert_tag 'input', :attributes => {:name => 'issue[subject]'}	1054	assert_tag 'input', :attributes => {:name => 'issue[subject]'}
1050	assert_tag 'textarea', :attributes => {:name => 'issue[description]'}	1055	assert_tag 'textarea', :attributes => {:name => 'issue[description]'}
@@ -1636,7 +1641,7 class IssuesControllerTest < ActionController::TestCase
1636		1641
1637	def test_update_edit_form	1642	def test_update_edit_form
1638	@request.session[:user_id] = 2	1643	@request.session[:user_id] = 2
1639	xhr :post, :new, :project_id => 1,	1644	xhr :put, :new, :project_id => 1,
1640	:id => 1,	1645	:id => 1,
1641	:issue => {:tracker_id => 2,	1646	:issue => {:tracker_id => 2,
1642	:subject => 'This is the test_new issue',	1647	:subject => 'This is the test_new issue',
@@ -1653,6 +1658,27 class IssuesControllerTest < ActionController::TestCase
1653	assert_equal 'This is the test_new issue', issue.subject	1658	assert_equal 'This is the test_new issue', issue.subject
1654	end	1659	end
1655		1660
		1661	def test_update_edit_form_with_project_change
		1662	@request.session[:user_id] = 2
		1663	xhr :put, :new, :project_id => 1,
		1664	:id => 1,
		1665	:project_change => '1',
		1666	:issue => {:project_id => 2,
		1667	:tracker_id => 2,
		1668	:subject => 'This is the test_new issue',
		1669	:description => 'This is the description',
		1670	:priority_id => 5}
		1671	assert_response :success
		1672	assert_template 'form'
		1673
		1674	issue = assigns(:issue)
		1675	assert_kind_of Issue, issue
		1676	assert_equal 1, issue.id
		1677	assert_equal 2, issue.project_id
		1678	assert_equal 2, issue.tracker_id
		1679	assert_equal 'This is the test_new issue', issue.subject
		1680	end
		1681
1656	def test_update_using_invalid_http_verbs	1682	def test_update_using_invalid_http_verbs
1657	@request.session[:user_id] = 2	1683	@request.session[:user_id] = 2
1658	subject = 'Updated by an invalid http verb'	1684	subject = 'Updated by an invalid http verb'
@@ -1696,6 +1722,57 class IssuesControllerTest < ActionController::TestCase
1696	assert mail.body.include?("Subject changed from #{old_subject} to #{new_subject}")	1722	assert mail.body.include?("Subject changed from #{old_subject} to #{new_subject}")
1697	end	1723	end
1698		1724
		1725	def test_put_update_with_project_change
		1726	@request.session[:user_id] = 2
		1727	ActionMailer::Base.deliveries.clear
		1728
		1729	assert_difference('Journal.count') do
		1730	assert_difference('JournalDetail.count', 3) do
		1731	put :update, :id => 1, :issue => {:project_id => '2',
		1732	:tracker_id => '1', # no change
		1733	:priority_id => '6',
		1734	:category_id => '3'
		1735	}
		1736	end
		1737	end
		1738	assert_redirected_to :action => 'show', :id => '1'
		1739	issue = Issue.find(1)
		1740	assert_equal 2, issue.project_id
		1741	assert_equal 1, issue.tracker_id
		1742	assert_equal 6, issue.priority_id
		1743	assert_equal 3, issue.category_id
		1744
		1745	mail = ActionMailer::Base.deliveries.last
		1746	assert_not_nil mail
		1747	assert mail.subject.starts_with?("[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}]")
		1748	assert mail.body.include?("Project changed from eCookbook to OnlineStore")
		1749	end
		1750
		1751	def test_put_update_with_tracker_change
		1752	@request.session[:user_id] = 2
		1753	ActionMailer::Base.deliveries.clear
		1754
		1755	assert_difference('Journal.count') do
		1756	assert_difference('JournalDetail.count', 2) do
		1757	put :update, :id => 1, :issue => {:project_id => '1',
		1758	:tracker_id => '2',
		1759	:priority_id => '6'
		1760	}
		1761	end
		1762	end
		1763	assert_redirected_to :action => 'show', :id => '1'
		1764	issue = Issue.find(1)
		1765	assert_equal 1, issue.project_id
		1766	assert_equal 2, issue.tracker_id
		1767	assert_equal 6, issue.priority_id
		1768	assert_equal 1, issue.category_id
		1769
		1770	mail = ActionMailer::Base.deliveries.last
		1771	assert_not_nil mail
		1772	assert mail.subject.starts_with?("[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}]")
		1773	assert mail.body.include?("Tracker changed from Bug to Feature request")
		1774	end
		1775
1699	def test_put_update_with_custom_field_change	1776	def test_put_update_with_custom_field_change
1700	@request.session[:user_id] = 2	1777	@request.session[:user_id] = 2
1701	issue = Issue.find(1)	1778	issue = Issue.find(1)

test/integration/api_test/issues_test.rb +16 0

@@ -455,6 +455,22 class ApiTest::IssuesTest < ActionController::IntegrationTest
455	end	455	end
456	end	456	end
457		457
		458	context "PUT /issues/3.xml with project change" do
		459	setup do
		460	@parameters = {:issue => {:project_id => 2, :subject => 'Project changed'}}
		461	end
		462
		463	should "update project" do
		464	assert_no_difference('Issue.count') do
		465	put '/issues/3.xml', @parameters, credentials('jsmith')
		466	end
		467
		468	issue = Issue.find(3)
		469	assert_equal 2, issue.project_id
		470	assert_equal 'Project changed', issue.subject
		471	end
		472	end
		473
458	context "PUT /issues/6.xml with failed update" do	474	context "PUT /issues/6.xml with failed update" do
459	setup do	475	setup do
460	@parameters = {:issue => {:subject => ''}}	476	@parameters = {:issue => {:subject => ''}}

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