jro_apps/redmine Commit - r14406:fb8e348254a2

Set default project version after selecting a different project on the new issue form (#1828)....

Jean-Philippe Lang -

r14406:fb8e348254a2

parent child

Context file:

r14406:fb8e348254a2

app/controllers/issues_controller.rb +5 0

                 if action_name == 'new' && params[:was_default_status] == attrs[:status_id]
                   attrs.delete(:status_id)
                 end
+                if action_name == 'new' && params[:form_update_triggered_by] == 'issue_project_id'
+                  # Discard submitted version when changing the project on the issue form
+                  # so we can use the default version for the new project
+                  attrs.delete(:fixed_version_id)
+                end
                 @issue.safe_attributes = attrs
                 if @issue.project

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

             <div class="splitcontentleft">
             <% if @issue.safe_attribute?('status_id') && @allowed_statuses.present? %>
             <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), {:required => true},
-                            :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}')" %></p>
+                            :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}', this)" %></p>
             <%= hidden_field_tag 'was_default_status', @issue.status_id, :id => nil if @issue.status == @issue.default_status %>
             <% else %>
             <p><label><%= l(:field_status) %></label> <%= @issue.status %></p>

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

             <%= labelled_fields_for :issue, @issue do |f| %>
             <%= call_hook(:view_issues_form_details_top, { :issue => @issue, :form => f }) %>
+            <%= hidden_field_tag 'form_update_triggered_by', '' %>
             <% if @issue.safe_attribute? 'is_private' %>
             <p id="issue_is_private_wrap">
             <% if @issue.safe_attribute?('project_id') && (!@issue.new_record? || @project.nil? || @issue.copy?) %>
             <p><%= f.select :project_id, project_tree_options_for_select(@issue.allowed_target_projects, :selected => @issue.project), {:required => true},
-                            :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}')" %></p>
+                            :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}', this)" %></p>
             <% end %>
             <% if @issue.safe_attribute? 'tracker_id' %>
             <p><%= f.select :tracker_id, @issue.project.trackers.collect {|t| [t.name, t.id]}, {:required => true},
-                            :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}')" %></p>
+                            :onchange => "updateIssueFrom('#{escape_javascript update_issue_form_path(@project, @issue)}', this)" %></p>
             <% end %>
             <% if @issue.safe_attribute? 'subject' %>

public/javascripts/application.js +4 -1

               return key;
             }
-            function updateIssueFrom(url) {
+            function updateIssueFrom(url, el) {
               $('#all_attributes input, #all_attributes textarea, #all_attributes select').each(function(){
                 $(this).data('valuebeforeupdate', $(this).val());
               });
+              if (el) {
+                $("#form_update_triggered_by").val($(el).attr('id'));
+              }
               return $.ajax({
                 url: url,
                 type: 'post',

test/functional/issues_controller_test.rb +16 0

@@ -1980,6 +1980,22 class IssuesControllerTest < ActionController::TestCase
1980	assert_equal 2, assigns(:issue).status_id	1980	assert_equal 2, assigns(:issue).status_id
1981	end	1981	end
1982		1982
		1983	def test_update_form_for_new_issue_should_ignore_version_when_changing_project
		1984	version = Version.generate!(:project_id => 1)
		1985	Project.find(1).update_attribute :default_version_id, version.id
		1986	@request.session[:user_id] = 2
		1987
		1988	xhr :post, :new, :issue => {:project_id => 1,
		1989	:fixed_version_id => ''},
		1990	:form_update_triggered_by => 'issue_project_id'
		1991	assert_response :success
		1992	assert_template 'new'
		1993
		1994	issue = assigns(:issue)
		1995	assert_equal 1, issue.project_id
		1996	assert_equal version, issue.fixed_version
		1997	end
		1998
1983	def test_post_create	1999	def test_post_create
1984	@request.session[:user_id] = 2	2000	@request.session[:user_id] = 2
1985	assert_difference 'Issue.count' do	2001	assert_difference 'Issue.count' do

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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