Skip to content

Commit

Permalink
Set @project so macros will work on the welcome and project list. #5781
Browse files Browse the repository at this point in the history
Contributed by Holger Just

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3824 e93f8b46-1217-0410-a6f0-8f06a7374b81
  • Loading branch information
edavis10 committed Jun 30, 2010
1 parent 43bbda1 commit 64d2221
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
4 changes: 4 additions & 0 deletions app/helpers/projects_helper.rb
Expand Up @@ -56,7 +56,10 @@ def render_project_hierarchy(projects)
s = ''
if projects.any?
ancestors = []
original_project = @project
projects.each do |project|
# set the project environment to please macros.
@project = project
if (ancestors.empty? || project.is_descendant_of?(ancestors.last))
s << "<ul class='projects #{ ancestors.empty? ? 'root' : nil}'>\n"
else
Expand All @@ -75,6 +78,7 @@ def render_project_hierarchy(projects)
ancestors << project
end
s << ("</li></ul>\n" * ancestors.size)
@project = original_project
end
s
end
Expand Down
2 changes: 2 additions & 0 deletions app/views/welcome/index.rhtml
Expand Up @@ -18,11 +18,13 @@
<h3><%=l(:label_project_latest)%></h3>
<ul>
<% for project in @projects %>
<% @project = project %>
<li>
<%= link_to h(project.name), :controller => 'projects', :action => 'show', :id => project %> (<%= format_time(project.created_on) %>)
<%= textilizable project.short_description, :project => project %>
</li>
<% end %>
<% @project = nil %>
</ul>
</div>
<% end %>
Expand Down

0 comments on commit 64d2221

Please sign in to comment.