kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rails3: view: html_safe for timelog/_report_criteria.html.erb 

Contributed by Eric Cline.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8449 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2012-01-01 06:11:01 +00:00
parent 5340a48253
commit 09e4fd0500
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/timelog/_report_criteria.html.erb
View File

@ -2,9 +2,9 @@
<% hours_for_value = select_hours(hours, criterias[level], value) -%> <% hours_for_value = select_hours(hours, criterias[level], value) -%>
<% next if hours_for_value.empty? -%> <% next if hours_for_value.empty? -%>
<tr class="<%= cycle('odd', 'even') %> <%= criterias.length > level+1 ? 'subtotal' : 'last-level' %>"> <tr class="<%= cycle('odd', 'even') %> <%= criterias.length > level+1 ? 'subtotal' : 'last-level' %>">
<%= '<td></td>' * level %> <%= ("<td></td>" * level).html_safe %>
<td><%= h(format_criteria_value(@report.available_criteria[criterias[level]], value)) %></td> <td><%= h(format_criteria_value(@report.available_criteria[criterias[level]], value)) %></td>
<%= '<td></td>' * (criterias.length - level - 1) -%> <%= ("<td></td>" * (criterias.length - level - 1)).html_safe -%>
<% total = 0 -%> <% total = 0 -%>
<% @report.periods.each do |period| -%> <% @report.periods.each do |period| -%>
<% sum = sum_hours(select_hours(hours_for_value, @report.columns, period.to_s)); total += sum -%> <% sum = sum_hours(select_hours(hours_for_value, @report.columns, period.to_s)); total += sum -%>