Use consistent tag names and avoid mutex errors in caching

otwcode · Sep 2, 2012 · 495fd31 · 495fd31
1 parent deb8e63
commit 495fd31
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
@@ -76,7 +76,7 @@ def show
       (@tag.child_types - %w(SubTag)).each do |child_type|
         tags = @tag.send(child_type.underscore.pluralize).limit(ArchiveConfig.TAG_LIST_LIMIT + 1)
         unless tags.blank?
-          children[child_type] = tags
+          children[child_type] = tags.uniq
         end
       end
       children

diff --git a/app/views/tags/show.html.erb b/app/views/tags/show.html.erb
@@ -88,7 +88,7 @@
         <% %w(Character Relationship Freeform).each do |type| %>
           <% if @tag_children[type].present? %>
             <div class="<%= type.to_s.pluralize.downcase %> listbox">
-              <h4 class="heading"><%= type.to_s.pluralize %>:</h4>
+              <h4 class="heading"><%= type.constantize::NAME.pluralize %>:</h4>
               <ul class="tags commas index group">
                 <%= tag_link_list(@tag_children[type]) %>
                 <% if @tag_children[type].length > ArchiveConfig.TAG_LIST_LIMIT %>