Used `unredacted` scope rather than explicit SQL

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

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index ebcd58dd042b7671ed5f8e9dfd462189899deb07..0b72040a3a6e80b70a659e2bebdd20cd03334e23 100644 (file)
--- 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)
@@ -78,7 +89,7 @@ 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