diff app/views/versions/_overview.html.erb @ 1115:433d4f72a19b redmine-2.2

Update to Redmine SVN revision 11137 on 2.2-stable branch
author Chris Cannam
date Mon, 07 Jan 2013 12:01:42 +0000
parents cbb26bc654de
children 622f24f53b42 261b3d9a4903
line wrap: on
line diff
--- a/app/views/versions/_overview.html.erb	Wed Jun 27 14:54:18 2012 +0100
+++ b/app/views/versions/_overview.html.erb	Mon Jan 07 12:01:42 2013 +0000
@@ -5,23 +5,28 @@
 <% end %>
 
 <p><%=h version.description %></p>
+<% if version.custom_field_values.any? %>
 <ul>
-  <% version.custom_values.each do |custom_value| %>
-    <% if !custom_value.value.blank? %>
+  <% version.custom_field_values.each do |custom_value| %>
+    <% if custom_value.value.present? %>
        <li><%=h custom_value.custom_field.name %>: <%=h show_value(custom_value) %></li>
     <% end %>
   <% end %>
 </ul>
+<% end %>
 
-<% if version.fixed_issues.count > 0 %>
+<% if version.issues_count > 0 %>
     <%= progress_bar([version.closed_pourcent, version.completed_pourcent], :width => '40em', :legend => ('%0.0f%' % version.completed_pourcent)) %>
     <p class="progress-info">
-        <%= link_to_if(version.closed_issues_count > 0, l(:label_x_closed_issues_abbr, :count => version.closed_issues_count), :controller => 'issues', :action => 'index', :project_id => version.project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1) %>
-        (<%= '%0.0f' % (version.closed_issues_count.to_f / version.fixed_issues.count * 100) %>%)
-        &#160;
-        <%= link_to_if(version.open_issues_count > 0, l(:label_x_open_issues_abbr, :count => version.open_issues_count), :controller => 'issues', :action => 'index', :project_id => version.project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1) %>
-        (<%= '%0.0f' % (version.open_issues_count.to_f / version.fixed_issues.count * 100) %>%)
+    	  <%= link_to(l(:label_x_issues, :count => version.issues_count), 
+              project_issues_path(version.project, :status_id => '*', :fixed_version_id => version, :set_filter => 1)) %>
+				&nbsp;
+        (<%= link_to_if(version.closed_issues_count > 0, l(:label_x_closed_issues_abbr, :count => version.closed_issues_count), 
+               project_issues_path(version.project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1)) %>
+        &#8212;
+        <%= link_to_if(version.open_issues_count > 0, l(:label_x_open_issues_abbr, :count => version.open_issues_count), 
+              project_issues_path(version.project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1)) %>)
     </p>
 <% else %>
-    <p><em><%= l(:label_roadmap_no_issues) %></em></p>
+    <p class="progress-info"><%= l(:label_roadmap_no_issues) %></p>
 <% end %>