Download as
Browse Code »

Commit 5dd92056d11448c712ca122399d1af4b3e85e2f5

Authored by Daniela Feitosa
Committed by Antonio Terceiro
1 parent 0a7c5853
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem990: fixing bug: after removing friend, friends list was crashing 

* fixing plugin to accept regexp
  * fixing sweeper to use timeout
Showing 3 changed files with 5 additions and 3 deletions   Show diff stats
app/sweepers/friendship_sweeper.rb
  Diff comments   View file @5dd9205
@@ -19,7 +19,7 @@ protected @@ -19,7 +19,7 @@ protected
19 def expire_cache(profile) 19 def expire_cache(profile)
20 [profile.friends_cache_key, profile.manage_friends_cache_key].each { |ck| 20 [profile.friends_cache_key, profile.manage_friends_cache_key].each { |ck|
21 cache_key = ck.gsub(/(.)-\d.*$/, '\1') 21 cache_key = ck.gsub(/(.)-\d.*$/, '\1')
22 - expire_fragment(/#{cache_key}/) 22 + expire_timeout_fragment(/#{cache_key}/)
23 } 23 }
24 24
25 blocks = profile.blocks.select{|b| b.kind_of?(FriendsBlock)} 25 blocks = profile.blocks.select{|b| b.kind_of?(FriendsBlock)}
app/views/profile/communities.rhtml
  Diff comments   View file @5dd9205
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 3
4 <h1><%= _("%s's communities") % profile.name %></h1> 4 <h1><%= _("%s's communities") % profile.name %></h1>
5 5
6 -<% cache(profile.communities_cache_key(params)) do %> 6 +<% cache_timeout(profile.communities_cache_key(params), 4.hour.from_now) do %>
7 <ul class='profile-list'> 7 <ul class='profile-list'>
8 <% @communities.each do |community| %> 8 <% @communities.each do |community| %>
9 <li><%= profile_image_link(community)%></li> 9 <li><%= profile_image_link(community)%></li>
vendor/plugins/timed_cached_fragment/lib/timed_cache_fragment.rb
  Diff comments   View file @5dd9205
@@ -16,7 +16,9 @@ module ActionController @@ -16,7 +16,9 @@ module ActionController
16 end 16 end
17 #handles the expiration of timeout fragment 17 #handles the expiration of timeout fragment
18 def expire_timeout_fragment(key) 18 def expire_timeout_fragment(key)
19 - @@cache_timeout_values[key] = nil 19 + @@cache_timeout_values.keys.select{|k| key === k}.each do |k|
  20 + @@cache_timeout_values[k] = nil
  21 + end
20 expire_fragment(/#{key}/) 22 expire_fragment(/#{key}/)
21 end 23 end
22 #checks to see if a cache has fully expired 24 #checks to see if a cache has fully expired