Fixed 10337 Regression: Admin raises issue in project not assigned to

git-svn-id: http://redmine.rubyforge.org/svn/trunk@474 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixed 10337 Regression: Admin raises issue in project not assigned to
git-svn-id: http://redmine.rubyforge.org/svn/trunk@474 e93f8b46-1217-0410-a6f0-8f06a7374b81
018b81a4 · Jean-Philippe Lang · 941a2405 · 018b81a4 · 018b81a4
Commit 018b81a4 authored Apr 24, 2007 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

projects_controller.rb app/controllers/projects_controller.rb +1 -1

issue_status.rb app/models/issue_status.rb +2 -2

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

--- a/app/models/issue_status.rb
+++ b/app/models/issue_status.rb
@@ -39,7 +39,7 @@ class IssueStatus < ActiveRecord::Base
  # Uses association cache when called more than one time
  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.sort{|x, y| x.position <=> y.position }
+    new_statuses.sort{|x, y| x.position <=> y.position } if new_statuses
  end
  
  # Same thing as above but uses a database query
@@ -48,7 +48,7 @@ class IssueStatus < ActiveRecord::Base
    new_statuses = workflows.find(:all, 
                                   :include => :new_status,
                                   :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 }
+    new_statuses.sort{|x, y| x.position <=> y.position } if new_statuses
  end
  
 private