diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-01-18 08:35:00 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-01-18 08:35:00 +0000 |
| commit | aaeba2dd20c6d46a2ecf1b4a78ca5400816d40f9 (patch) | |
| tree | 7ca38a0d8641ef3a426d532dfb5cc1f6beddb6cb | |
| parent | 4c7e1629a392249e7b406527cbbb599dab6abe9d (diff) | |
| download | redmine-aaeba2dd20c6d46a2ecf1b4a78ca5400816d40f9.tar.gz redmine-aaeba2dd20c6d46a2ecf1b4a78ca5400816d40f9.zip | |
Show only visible children/ancestors on project overview.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/work@2278 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | nested_projects/app/controllers/projects_controller.rb | 3 | ||||
| -rw-r--r-- | nested_projects/app/views/projects/show.rhtml | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/nested_projects/app/controllers/projects_controller.rb b/nested_projects/app/controllers/projects_controller.rb index 81a5b3dc9..eb94478e1 100644 --- a/nested_projects/app/controllers/projects_controller.rb +++ b/nested_projects/app/controllers/projects_controller.rb @@ -80,7 +80,8 @@ class ProjectsController < ApplicationController # Show @project def show @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role} - @subprojects = @project.children.find(:all, :conditions => Project.visible_by(User.current)) + @subprojects = @project.children.visible + @ancestors = @project.ancestors.visible @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC") @trackers = @project.rolled_up_trackers diff --git a/nested_projects/app/views/projects/show.rhtml b/nested_projects/app/views/projects/show.rhtml index fa6571306..6d5a1536b 100644 --- a/nested_projects/app/views/projects/show.rhtml +++ b/nested_projects/app/views/projects/show.rhtml @@ -4,11 +4,13 @@ <%= textilizable @project.description %> <ul> <% unless @project.homepage.blank? %><li><%=l(:field_homepage)%>: <%= link_to(h(@project.homepage), @project.homepage) %></li><% end %> - <% if @subprojects.any? %> - <li><%=l(:label_subproject_plural)%>: <%= @subprojects.collect{|p| link_to(h(p.name), :action => 'show', :id => p)}.join(", ") %></li> - <% end %> - <% if @project.parent %> - <li><%=l(:field_parent)%>: <%= link_to h(@project.parent.name), :controller => 'projects', :action => 'show', :id => @project.parent %></li> + <% if @subprojects.any? %> + <li><%=l(:label_subproject_plural)%>: + <%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join(", ") %></li> + <% end %> + <% if @ancestors.any? %> + <li><%=l(:field_parent)%>: + <%= @ancestors.collect {|p| link_to(h(p), :action => 'show', :id => p)}.join(" » ") %></li> <% end %> <% @project.custom_values.each do |custom_value| %> <% if !custom_value.value.empty? %> |