From 1996af104d959dfaad40c366a8a9df36c2df1d66 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 15 May 2012 19:33:42 +0000 Subject: Fixed that watchers delete links are escaped on the issue view (#10932). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9700 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/watchers_helper.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index 075708586..e13075533 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -45,23 +45,27 @@ module WatchersHelper # Returns a comma separated list of users watching the given object def watchers_list(object) remove_allowed = User.current.allowed_to?("delete_#{object.class.name.underscore}_watchers".to_sym, object.project) + content = ''.html_safe lis = object.watcher_users.collect do |user| - s = avatar(user, :size => "16").to_s + link_to_user(user, :class => 'user').to_s + s = ''.html_safe + s << avatar(user, :size => "16").to_s + s << link_to_user(user, :class => 'user') if remove_allowed url = {:controller => 'watchers', :action => 'destroy', :object_type => object.class.to_s.underscore, :object_id => object.id, :user_id => user} - s += ' ' + link_to_remote(image_tag('delete.png'), + s << ' ' + s << link_to_remote(image_tag('delete.png'), {:url => url}, :href => url_for(url), :style => "vertical-align: middle", :class => "delete") end - content_tag :li, s.html_safe + content << content_tag('li', s) end - (lis.empty? ? "" : "").html_safe + content.present? ? content_tag('ul', content) : content end def watchers_checkboxes(object, users, checked=nil) -- cgit v1.2.3