Return a copy of the note data on creation and update

[rails.git] / app / helpers / browse_helper.rb

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 9a49abd679c015f4c3a02259e9b9a2ac849f549d..c4e4d425a5ef997a97dbb84cc2d75eeac53a5cac 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -4,24 +4,43 @@ module BrowseHelper
   end
 
   def printable_name(object, version=false)
-    name = t 'printable_name.with_id', :id => object.id.to_s
+    if object.id.is_a?(Array)
+      id = object.id[0]
+    else
+      id = object.id
+    end
+    name = t 'printable_name.with_id', :id => id.to_s
     if version
       name = t 'printable_name.with_version', :id => name, :version => object.version.to_s
     end
-    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'
-      name = t 'printable_name.with_name',  :name => object.tags['name'].to_s, :id => name
+
+    # don't look at object tags if redacted, so as to avoid giving
+    # away redacted version tag information.
+    unless 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'
+        name = t 'printable_name.with_name',  :name => object.tags['name'].to_s, :id => name
+      end
     end
+
     return name
   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)
@@ -42,17 +61,9 @@ module BrowseHelper
     end
   end
 
-  def note_author(object)
-    if object.author.nil?
-      h(object.author_name)
-    else
-      link_to h(object.author_name), :controller => "user", :action => "view", :display_name => object.author_name
-    end
-  end
-
 private
 
-  ICON_TAGS = [ 
+  ICON_TAGS = [
     "aeroway", "amenity", "barrier", "building", "highway", "historic", "landuse",
     "leisure", "man_made", "natural", "railway", "shop", "tourism", "waterway"
   ]
@@ -81,15 +92,15 @@ private
 
   def wikipedia_link(key, value)
     # Some k/v's are wikipedia=http://en.wikipedia.org/wiki/Full%20URL
-    return nil if value =~ /^http:\/\//
+    return nil if value =~ /^https?:\/\//
 
     if key == "wikipedia"
       # This regex should match Wikipedia language codes, everything
       # from de to zh-classical
-      if value =~ /^([a-z-]{2,12}):(.+)$/
+      if value =~ /^([a-z-]{2,12}):(.+)$/i
         # Value is <lang>:<title> so split it up
+        # Note that value is always left as-is, see: https://trac.openstreetmap.org/ticket/4315
         lang  = $1
-        value = $2
       else
         # Value is <title> so default to English Wikipedia
         lang = 'en'