diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-06-30 03:32:18 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-06-30 03:32:18 +0000 |
| commit | 64d2221db526f695919eb9aba370e22ed3dc09f8 (patch) | |
| tree | fa6aa5ffbf10e27808b50fd523e6ae0239616db2 | |
| parent | 43bbda1966d2f666318e1339c3f42d34761ddbaa (diff) | |
| download | redmine-64d2221db526f695919eb9aba370e22ed3dc09f8.tar.gz redmine-64d2221db526f695919eb9aba370e22ed3dc09f8.zip | |
Set @project so macros will work on the welcome and project list. #5781
Contributed by Holger Just
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3824 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/projects_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/welcome/index.rhtml | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index e3a020818..044ccfb77 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -56,7 +56,10 @@ module ProjectsHelper 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 @@ -75,6 +78,7 @@ module ProjectsHelper ancestors << project end s << ("</li></ul>\n" * ancestors.size) + @project = original_project end s end diff --git a/app/views/welcome/index.rhtml b/app/views/welcome/index.rhtml index 279c35421..a0ada7cce 100644 --- a/app/views/welcome/index.rhtml +++ b/app/views/welcome/index.rhtml @@ -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 %> |