X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9f12d24fbd4d96f7006d1e02697b5ca860a3c486..7c42552f16c646d5a21595bc008503b7bbb311f7:/app/helpers/browse_helper.rb diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index de439d56f..0b72040a3 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -13,6 +13,9 @@ module BrowseHelper if version name = t 'printable_name.with_version', :id => name, :version => object.version.to_s end + # stop here if redacted to avoid giving away redacted version tags. + return name if object.redacted? + if object.tags.include? "name:#{I18n.locale}" name = t 'printable_name.with_name', :name => object.tags["name:#{I18n.locale}"].to_s, :id => name elsif object.tags.include? 'name' @@ -22,11 +25,19 @@ module BrowseHelper end def link_class(type, object) - return type + " " + h(icon_tags(object).join(' ')) + (object.visible == false ? ' deleted' : '') + if object.redacted? + type + " deleted" + else + type + " " + h(icon_tags(object).join(' ')) + (object.visible == false ? ' deleted' : '') + end end def link_title(object) - return h(icon_tags(object).map { |k,v| k + '=' + v }.to_sentence) + if object.redacted? + "" + else + h(icon_tags(object).map { |k,v| k + '=' + v }.to_sentence) + end end def format_key(key)