Merge commit '1.2.1' into update

[redminele/redmine.git] / app / views / projects / index.api.rsb

diff --git a/app/views/projects/index.api.rsb b/app/views/projects/index.api.rsb
index 121300c..552c1f6 100644 (file)
--- a/app/views/projects/index.api.rsb
+++ b/app/views/projects/index.api.rsb
@@ -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