summaryrefslogtreecommitdiffstats
path: root/app/views
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-12-21 13:42:19 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-12-21 13:42:19 +0000
commit0d5df3a73e06ae6d2628c7e2b18d13f8d5fafd3e (patch)
treea8c11bbebc95283f5e380ee4920c03add54bc261 /app/views
parent576d333c2c58cd44bb4f3bac9ffabf58445ead5f (diff)
downloadredmine-0d5df3a73e06ae6d2628c7e2b18d13f8d5fafd3e.tar.gz
redmine-0d5df3a73e06ae6d2628c7e2b18d13f8d5fafd3e.zip
Rails3: view: html_safe for timelog/bulk_edit.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8308 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
-rw-r--r--app/views/timelog/bulk_edit.html.erb7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/timelog/bulk_edit.html.erb b/app/views/timelog/bulk_edit.html.erb
index 80e626ae9..de1f9a365 100644
--- a/app/views/timelog/bulk_edit.html.erb
+++ b/app/views/timelog/bulk_edit.html.erb
@@ -2,12 +2,13 @@
<ul>
<%= @time_entries.collect {|i| content_tag('li',
- link_to(h("#{i.spent_on.strftime("%Y-%m-%d")} - #{i.project}: #{l(:label_f_hour_plural, :value => i.hours)}"), { :action => 'edit', :id => i })
- )}.join("\n") %>
+ link_to(h("#{i.spent_on.strftime("%Y-%m-%d")} - #{i.project}: #{l(:label_f_hour_plural, :value => i.hours)}"),
+ { :action => 'edit', :id => i })
+ )}.join("\n").html_safe %>
</ul>
<% form_tag(:action => 'bulk_update') do %>
-<%= @time_entries.collect {|i| hidden_field_tag('ids[]', i.id)}.join %>
+<%= @time_entries.collect {|i| hidden_field_tag('ids[]', i.id)}.join.html_safe %>
<div class="box tabular">
<div>
<p>