Updated show.html.erb to use html_safe output of helpers.

Also deleted redunand method in applications_helper.rb, with the whole helper. This is backwards compatible to Rails 2.3.8, which should be OK for most Redmine 1.x releases.
azatoth · Jul 7, 2012 · 6fcd6de · 6fcd6de
1 parent 3d57035
commit 6fcd6de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb
@@ -74,7 +74,7 @@ t_height = g_height + headers_height
 <div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;overflow:hidden;" class="gantt_hdr"></div>
 
 <div class="gantt_subjects">
-<%= @gantt.subjects %>
+<%= @gantt.subjects.html_safe %>
 </div>
 
 </div>
@@ -155,7 +155,7 @@ if show_days
 	end
 end %>
 
-<%= @gantt.lines %>
+<%= @gantt.lines.html_safe %>
 
 <%
 #
@@ -172,8 +172,8 @@ if Date.today >= @gantt.date_from and Date.today <= @gantt.date_to %>
 
 <table width="100%">
 <tr>
-<td align="left"><%= link_to_content_update('&#171; ' + l(:label_previous), params.merge(@gantt.params_previous)) %></td>
-<td align="right"><%= link_to_content_update(l(:label_next) + ' &#187;', params.merge(@gantt.params_next)) %></td>
+<td align="left"><%= link_to('&#171; ' + l(:label_previous), params.merge(@gantt.params_previous)) %></td>
+<td align="right"><%= link_to(l(:label_next) + ' &#187;', params.merge(@gantt.params_next)) %></td>
 </tr>
 </table>