Skip to content

Commit

Permalink
Merge pull request #2109 from bgeuken/bs_requests
Browse files Browse the repository at this point in the history
[webui] Fix raw html links on request show page (issue #2107)
  • Loading branch information
adrianschroeter committed Sep 7, 2016
2 parents 23a201b + 4f0f0b9 commit 6d5562e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/api/app/views/webui/project/status.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@
end
end
p['requests_to'].each do |number|
outs.unshift("Request %s to %s" % [link_to(number, :controller => :request, :action => :show, :number => number), p['develproject']])
outs.unshift(("Request %s to %s" % [link_to(number, :controller => :request, :action => :show, :number => number), h(p['develproject'])]).html_safe)
icon = "changes"
sortkey = "3-request%06d-%s" % [ 999999 - number, p['name']]
end
p['requests_from'].each do |number|
outs.unshift("Request %s to %s" % [link_to(number, :controller => :request, :action => :show, :number => number), @project.name])
outs.unshift(("Request %s to %s" % [link_to(number, :controller => :request, :action => :show, :number => number), h(@project.name)]).html_safe)
icon = "changes"
sortkey = "2-drequest%06d-%s" % [ 999999 - number, p['name']]
end
Expand All @@ -113,7 +113,7 @@
end
if p['firstfail']
outs.unshift(link_to("Fails", :controller => :package,
:action => :live_build_log, :arch => p['failedarch'], :repository => p['failedrepo'], :project => @project.name, :package => p['name']) +
:action => :live_build_log, :arch => h(p['failedarch']), :repository => h(p['failedrepo']), :project => h(@project.name), :package => h(p['name'])).html_safe +
" for #{Integer(Time.now.to_i - p['firstfail']) / 3600 / 24} days: " +
content_tag(:span, show_status_comment( p['failedcomment'], p['name'], p['firstfail'], comments_to_clear ), id: valid_xml_id('comment_' + p['name'])))
icon = "error"
Expand Down

0 comments on commit 6d5562e

Please sign in to comment.