Merged r6203 and r6204 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6205 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-07-09 11:42:12 +00:00
parent 2a799e8367
commit 0527e8cedf
3 changed files with 7 additions and 1 deletions
@@ -5,7 +5,7 @@ api.array :projects, api_meta(:total_count => @project_count, :offset => @offset
      api.name        project.name
      api.identifier  project.identifier
      api.description project.description
-      api.parent(:id => project.parent_id, :name => project.parent.name) unless project.parent.nil?
+      api.parent(:id => project.parent.id, :name => project.parent.name) if project.parent && project.parent.visible?
      
      render_api_custom_values project.visible_custom_field_values, api