diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-01-01 06:11:01 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-01-01 06:11:01 +0000 |
| commit | 09e4fd0500ff754b8e9fc984a3af70e1b3fb47a7 (patch) | |
| tree | 18e86b09e8dd4df868afc0c146d361182a6ec0a5 /app/views/timelog | |
| parent | 5340a48253225383549ae471c845608f0923f296 (diff) | |
| download | redmine-09e4fd0500ff754b8e9fc984a3af70e1b3fb47a7.tar.gz redmine-09e4fd0500ff754b8e9fc984a3af70e1b3fb47a7.zip | |
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
Diffstat (limited to 'app/views/timelog')
| -rw-r--r-- | app/views/timelog/_report_criteria.html.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/timelog/_report_criteria.html.erb b/app/views/timelog/_report_criteria.html.erb index d3239ec01..9a5d142f2 100644 --- a/app/views/timelog/_report_criteria.html.erb +++ b/app/views/timelog/_report_criteria.html.erb @@ -2,9 +2,9 @@ <% hours_for_value = select_hours(hours, criterias[level], value) -%> <% next if hours_for_value.empty? -%> <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></td>' * (criterias.length - level - 1) -%> +<%= ("<td></td>" * (criterias.length - level - 1)).html_safe -%> <% total = 0 -%> <% @report.periods.each do |period| -%> <% sum = sum_hours(select_hours(hours_for_value, @report.columns, period.to_s)); total += sum -%> |