jro_apps/redmine Commit - r7437:e2f57b587495

Rails3: lib: helper: use html_safe for Gantt...

Toshi MARUYAMA -

r7437:e2f57b587495

parent child

Context file:

r7437:e2f57b587495

Collapse all files

lib/redmine/helpers/gantt.rb +21 -21

                   def subject_for_project(project, options)
                     case options[:format]
                     when :html
-                      subject = "<span class='icon icon-projects #{project.overdue? ? 'project-overdue' : ''}'>"
+                      subject = "<span class='icon icon-projects #{project.overdue? ? 'project-overdue' : ''}'>".html_safe
-                      subject << view.link_to_project(project)
+                      subject << view.link_to_project(project).html_safe
-                      subject << '</span>'
+                      subject << '</span>'.html_safe
                       html_subject(options, subject, :css => "project-name")
                     when :image
                       image_subject(options, project.name)
                   def subject_for_version(version, options)
                     case options[:format]
                     when :html
-                      subject = "<span class='icon icon-package #{version.behind_schedule? ? 'version-behind-schedule' : ''} #{version.overdue? ? 'version-overdue' : ''}'>"
+                      subject = "<span class='icon icon-package #{version.behind_schedule? ? 'version-behind-schedule' : ''} #{version.overdue? ? 'version-overdue' : ''}'>".html_safe
-                      subject << view.link_to_version(version)
+                      subject << view.link_to_version(version).html_safe
-                      subject << '</span>'
+                      subject << '</span>'.html_safe
                       html_subject(options, subject, :css => "version-name")
                     when :image
                       image_subject(options, version.to_s_with_project)
                       css_classes << ' issue-behind-schedule' if issue.behind_schedule?
                       css_classes << ' icon icon-issue' unless Setting.gravatar_enabled? && issue.assigned_to
-                      subject = "<span class='#{css_classes}'>"
+                      subject = "<span class='#{css_classes}'>".html_safe
                       if issue.assigned_to.present?
                         assigned_string = l(:field_assigned_to) + ": " + issue.assigned_to.name
-                        subject << view.avatar(issue.assigned_to, :class => 'gravatar icon-gravatar', :size => 10, :title => assigned_string).to_s
+                        subject << view.avatar(issue.assigned_to, :class => 'gravatar icon-gravatar', :size => 10, :title => assigned_string).to_s.html_safe
                       end
-                      subject << view.link_to_issue(issue)
+                      subject << view.link_to_issue(issue).html_safe
-                      subject << '</span>'
+                      subject << '</span>'.html_safe
                       html_subject(options, subject, :css => "issue-subject", :title => issue.subject) + "\n"
                     when :image
                       image_subject(options, issue.subject)
                     output = ''
                     # Renders the task bar, with progress and late
                     if coords[:bar_start] && coords[:bar_end]
-                      output << "<div style='top:#{ params[:top] }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_end] - coords[:bar_start] - 2}px;' class='#{options[:css]} task_todo'>&nbsp;</div>"
+                      output << "<div style='top:#{ params[:top] }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_end] - coords[:bar_start] - 2}px;' class='#{options[:css]} task_todo'>&nbsp;</div>".html_safe
                       if coords[:bar_late_end]
-                        output << "<div style='top:#{ params[:top] }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_late_end] - coords[:bar_start] - 2}px;' class='#{options[:css]} task_late'>&nbsp;</div>"
+                        output << "<div style='top:#{ params[:top] }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_late_end] - coords[:bar_start] - 2}px;' class='#{options[:css]} task_late'>&nbsp;</div>".html_safe
                       end
                       if coords[:bar_progress_end]
-                        output << "<div style='top:#{ params[:top] }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_progress_end] - coords[:bar_start] - 2}px;' class='#{options[:css]} task_done'>&nbsp;</div>"
+                        output << "<div style='top:#{ params[:top] }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_progress_end] - coords[:bar_start] - 2}px;' class='#{options[:css]} task_done'>&nbsp;</div>".html_safe
                       end
                     end
                     # Renders the markers
                     if options[:markers]
                       if coords[:start]
-                        output << "<div style='top:#{ params[:top] }px;left:#{ coords[:start] }px;width:15px;' class='#{options[:css]} marker starting'>&nbsp;</div>"
+                        output << "<div style='top:#{ params[:top] }px;left:#{ coords[:start] }px;width:15px;' class='#{options[:css]} marker starting'>&nbsp;</div>".html_safe
                       end
                       if coords[:end]
-                        output << "<div style='top:#{ params[:top] }px;left:#{ coords[:end] + params[:zoom] }px;width:15px;' class='#{options[:css]} marker ending'>&nbsp;</div>"
+                        output << "<div style='top:#{ params[:top] }px;left:#{ coords[:end] + params[:zoom] }px;width:15px;' class='#{options[:css]} marker ending'>&nbsp;</div>".html_safe
                       end
                     end
                     # Renders the label on the right
                     if options[:label]
-                      output << "<div style='top:#{ params[:top] }px;left:#{ (coords[:bar_end] || 0) + 8 }px;' class='#{options[:css]} label'>"
+                      output << "<div style='top:#{ params[:top] }px;left:#{ (coords[:bar_end] || 0) + 8 }px;' class='#{options[:css]} label'>".html_safe
                       output << options[:label]
-                      output << "</div>"
+                      output << "</div>".html_safe
                     end
                     # Renders the tooltip
                     if options[:issue] && coords[:bar_start] && coords[:bar_end]
-                      output << "<div class='tooltip' style='position: absolute;top:#{ params[:top] }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_end] - coords[:bar_start] }px;height:12px;'>"
+                      output << "<div class='tooltip' style='position: absolute;top:#{ params[:top] }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_end] - coords[:bar_start] }px;height:12px;'>".html_safe
-                      output << '<span class="tip">'
+                      output << '<span class="tip">'.html_safe
-                      output << view.render_issue_tooltip(options[:issue])
+                      output << view.render_issue_tooltip(options[:issue]).html_safe
-                      output << "</span></div>"
+                      output << "</span></div>".html_safe
                     end
                     @lines << output
                     output

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages