From 05ff26c141b32160fc6e53cbc0477daa0589b4d9 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Wed, 29 Aug 2007 20:13:02 +0000 Subject: [PATCH] Fixed: "subproject of" list should not show archived projects. git-svn-id: http://redmine.rubyforge.org/svn/trunk@678 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/projects_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 6922c98b..8d8250d2 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -66,7 +66,7 @@ class ProjectsController < ApplicationController # Add a new project def add @custom_fields = IssueCustomField.find(:all) - @root_projects = Project.find(:all, :conditions => "parent_id is null") + @root_projects = Project.find(:all, :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}") @project = Project.new(params[:project]) if request.get? @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project) } @@ -102,7 +102,7 @@ class ProjectsController < ApplicationController end def settings - @root_projects = Project::find(:all, :conditions => ["parent_id is null and id <> ?", @project.id]) + @root_projects = Project::find(:all, :conditions => ["parent_id IS NULL AND status = #{Project::STATUS_ACTIVE} AND id <> ?", @project.id]) @custom_fields = IssueCustomField.find(:all) @issue_category ||= IssueCategory.new @member ||= @project.members.new