diff --git a/app/models/collection.rb b/app/models/collection.rb index ed78ea4ce3f..114ac1f469d 100755 --- a/app/models/collection.rb +++ b/app/models/collection.rb @@ -409,8 +409,13 @@ def clear_icon def self.expire_blurb_cache(id) # Expire both versions of the blurb, whether the user is logged in or not. %w[logged-in logged-out].each do |logged_in| - cache_key = "collection-blurb-#{logged_in}-#{id}-v5" - ActionController::Base.new.expire_fragment(cache_key) + [ + "collection-blurb-#{logged_in}-#{id}-v5-header", + "collection-blurb-#{logged_in}-#{id}-v5-summary", + "collection-blurb-#{logged_in}-#{id}-v5-body" + ].each do |cache_key| + ActionController::Base.new.expire_fragment(cache_key) + end end end diff --git a/app/views/collections/_collection_blurb.html.erb b/app/views/collections/_collection_blurb.html.erb index ea52c53003d..e3ccab86f58 100644 --- a/app/views/collections/_collection_blurb.html.erb +++ b/app/views/collections/_collection_blurb.html.erb @@ -1,7 +1,7 @@
+ +- + <% cache("collection-blurb-#{logged_in}-#{collection.id}-v5-body", expires_in: ArchiveConfig.MINUTES_UNTIL_COLLECTION_BLURBS_EXPIRE.minutes, skip_digest: true) do %><%= t(".summary") %>
++ <% cache("collection-blurb-#{logged_in}-#{collection.id}-v5-summary", expires_in: ArchiveConfig.MINUTES_UNTIL_COLLECTION_BLURBS_EXPIRE.minutes, skip_digest: true) do %> <%=raw strip_images(sanitize_field(collection, :description)) || " ".html_safe %> + <% end %> + <% if collection.challenge && collection.challenge.signup_open %> +- <% if collection.challenge && collection.challenge.signup_open %> -<%= t(".signups_close_at") %> <%= time_in_zone(collection.challenge.signups_close_at, (collection.challenge.time_zone || Time.zone.name)) %>
+ <% end %> +<%= ts("Sign-ups close at:") %> <%= time_in_zone(collection.challenge.signups_close_at, (collection.challenge.time_zone || Time.zone.name)) %>
- <% end %> -
(<%= collection.closed? ? ts("Closed") : ts("Open") %>, <%= collection.moderated? ? ts("Moderated") : ts("Unmoderated") %><%= collection.unrevealed? ? ts(", Unrevealed") : "" %><%= collection.anonymous? ? ts(", Anonymous") : "" %><%= collection.gift_exchange? ? ts(", Gift Exchange Challenge") : "" %><%= collection.prompt_meme? ? ts(", Prompt Meme Challenge") : "" %>)
@@ -54,7 +57,7 @@ <% end %> - <% end %> + <% end %> <% if collection.user_is_owner?(current_user) || (collection.challenge && collection.challenge.signup_open && logged_in?) || (collection.moderated? && logged_in?) %>