kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed: default status not showing in new issue

Browse Source 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@475 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2007-04-24 15:19:49 +00:00
parent 018b81a46a
commit c995be94d9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/projects_controller.rb
View File

@ -216,7 +216,7 @@ class ProjectsController < ApplicationController
default_status = IssueStatus.default default_status = IssueStatus.default
@issue = Issue.new(:project => @project, :tracker => @tracker) @issue = Issue.new(:project => @project, :tracker => @tracker)
@issue.status = default_status @issue.status = default_status
@allowed_statuses = (default_status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) || [default_status])if logged_in_user @allowed_statuses = ([default_status] + default_status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker))if logged_in_user
if request.get? if request.get?
@issue.start_date = Date.today @issue.start_date = Date.today
@custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) } @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) }

4
app/models/issue_status.rb
View File

@ -39,7 +39,7 @@ class IssueStatus < ActiveRecord::Base
# Uses association cache when called more than one time # Uses association cache when called more than one time
def new_statuses_allowed_to(role, tracker) def new_statuses_allowed_to(role, tracker)
new_statuses = workflows.select {|w| w.role_id == role.id && w.tracker_id == tracker.id}.collect{|w| w.new_status} if role && tracker new_statuses = workflows.select {|w| w.role_id == role.id && w.tracker_id == tracker.id}.collect{|w| w.new_status} if role && tracker
new_statuses.sort{|x, y| x.position <=> y.position } if new_statuses new_statuses ? new_statuses.sort{|x, y| x.position <=> y.position } : []
end end
# Same thing as above but uses a database query # Same thing as above but uses a database query
@ -48,7 +48,7 @@ class IssueStatus < ActiveRecord::Base
new_statuses = workflows.find(:all, new_statuses = workflows.find(:all,
:include => :new_status, :include => :new_status,
:conditions => ["role_id=? and tracker_id=?", role.id, tracker.id]).collect{ |w| w.new_status } if role && tracker :conditions => ["role_id=? and tracker_id=?", role.id, tracker.id]).collect{ |w| w.new_status } if role && tracker
new_statuses.sort{|x, y| x.position <=> y.position } if new_statuses new_statuses ? new_statuses.sort{|x, y| x.position <=> y.position } : []
end end
private private