##// END OF EJS Templates
Merged r1376 from trunk....
Jean-Philippe Lang -
r1527:a55317f09c39
parent child
Show More
@@ -138,7 +138,7 class IssuesController < ApplicationController
138 @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) } :
138 @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) } :
139 @issue.custom_values
139 @issue.custom_values
140 else
140 else
141 requested_status = IssueStatus.find_by_id(params[:issue][:status_id])
141 requested_status = (params[:issue] && params[:issue][:status_id] ? IssueStatus.find_by_id(params[:issue][:status_id]) : default_status)
142 # Check that the user is allowed to apply the requested status
142 # Check that the user is allowed to apply the requested status
143 @issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
143 @issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
144 @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x,
144 @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x,
General Comments 0
You need to be logged in to leave comments. Login now