X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/43a4a3a887ef6efb54491f8cc873cc7dc424c1d2..8e21e4e80156a1fc29d7b283b254ff623ca844b6:/app/helpers/browse_helper.rb?ds=inline diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index 29f243cf4..7aa6e4754 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -1,26 +1,25 @@ module BrowseHelper def element_single_current_link(type, object, url) - link_to url, { :class => element_class(type, object), :title => link_title(object), :rel => (link_follow(object) if type == "node") } do + link_to url, { :class => element_class(type, object), :title => element_title(object), :rel => (link_follow(object) if type == "node") } do element_strikethrough object do - printable_name object + printable_element_name object end end end def element_list_item(type, object, &block) - tag.li :class => element_class(type, object) do + tag.li :class => element_class(type, object), :title => element_title(object) do element_strikethrough object, &block end end - def printable_name(object, version: false) + def printable_element_name(object) id = if object.id.is_a?(Array) object.id[0] else object.id end - name = t "printable_name.with_id", :id => id.to_s - name = t "printable_name.with_version", :id => name, :version => object.version.to_s if version + name = id.to_s # don't look at object tags if redacted, so as to avoid giving # away redacted version tag information. @@ -41,6 +40,10 @@ module BrowseHelper name end + def printable_element_version(object) + t "printable_name.version", :version => object.version + end + def element_strikethrough(object, &block) if object.redacted? || !object.visible? tag.s(&block) @@ -55,7 +58,7 @@ module BrowseHelper classes.join(" ") end - def link_title(object) + def element_title(object) if object.redacted? "" else