summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
Diffstat (limited to 'app/views')
-rw-r--r--app/views/version_reports/_issue_row.html.erb5
-rw-r--r--app/views/version_reports/_main_issue_row.html.erb8
2 files changed, 10 insertions, 3 deletions
diff --git a/app/views/version_reports/_issue_row.html.erb b/app/views/version_reports/_issue_row.html.erb
index 3ff7020..7d89e69 100644
--- a/app/views/version_reports/_issue_row.html.erb
+++ b/app/views/version_reports/_issue_row.html.erb
@@ -4,7 +4,10 @@
<%= display_issue(issue, :tracker) %>
</td>
<td>
- <%= l_hours(issue.total_spent_hours) %>
+ <%= l_hours(issue.total_spent_hours) if @show_time %>
+ </td>
+ <td>
+ &nbsp;
</td>
</tr>
<%- if issue.children.any? -%>
diff --git a/app/views/version_reports/_main_issue_row.html.erb b/app/views/version_reports/_main_issue_row.html.erb
index 32518e9..c83eb6d 100644
--- a/app/views/version_reports/_main_issue_row.html.erb
+++ b/app/views/version_reports/_main_issue_row.html.erb
@@ -2,13 +2,17 @@
<tr>
<td>
<h1><%= display_issue(issue) %></h1>
+ <%= hour_budget_error(issue) %>
</td>
<td>
- <%= l_hours(issue.total_spent_hours) %>
+ <%= l_hours(issue.total_spent_hours) if @show_time %>
+ </td>
+ <td>
+ <%= hours_to_money(issue.total_spent_hours) if @show_money %>
</td>
</tr>
<tr>
- <td colspan="2">
+ <td colspan="3">
From <%= issue.start_date %> to <%= issue.due_date %>.
<div class="wiki">
<%= textilizable issue, :description %>