Mercurial > hg > soundsoftware-site
diff app/views/projects/show.rhtml @ 37:94944d00e43c
* Update to SVN trunk rev 4411
author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
---|---|
date | Fri, 19 Nov 2010 13:24:41 +0000 |
parents | 40f7cfd4df19 |
children | 1a514b9347d4 361602c5e6bb cbce1fd3b1b7 |
line wrap: on
line diff
--- a/app/views/projects/show.rhtml Fri Sep 24 14:06:04 2010 +0100 +++ b/app/views/projects/show.rhtml Fri Nov 19 13:24:41 2010 +0000 @@ -16,7 +16,7 @@ <li><%=l(:label_subproject_plural)%>: <%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join(", ") %></li> <% end %> - <% @project.custom_values.each do |custom_value| %> + <% @project.visible_custom_field_values.each do |custom_value| %> <% if !custom_value.value.blank? %> <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li> <% end %> @@ -67,8 +67,8 @@ <% if @total_hours && User.current.allowed_to?(:view_time_entries, @project) %> <h3><%= l(:label_spent_time) %></h3> <p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p> - <p><%= link_to(l(:label_details), {:controller => 'timelog', :action => 'details', :project_id => @project}) %> | - <%= link_to(l(:label_report), {:controller => 'timelog', :action => 'report', :project_id => @project}) %></p> + <p><%= link_to(l(:label_details), {:controller => 'timelog', :action => 'index', :project_id => @project}) %> | + <%= link_to(l(:label_report), {:controller => 'time_entry_reports', :action => 'report', :project_id => @project}) %></p> <% end %> <%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %> <% end %>