Download as
Browse Code »

Commit d070eece9c104fb7e06532380202a506aeb62029

Authored by Antonio Terceiro
1 parent b62b0d9c
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Some points still need #is_cache_expired?(key)

Showing 2 changed files with 7 additions and 2 deletions   Show diff stats
app/controllers/public/profile_controller.rb
  Diff comments   View file @d070eec
@@ -23,7 +23,7 @@ class ProfileController < PublicController @@ -23,7 +23,7 @@ class ProfileController < PublicController
23 23
24 def tags 24 def tags
25 @tags_cache_key = "tags_profile_#{profile.id.to_s}" 25 @tags_cache_key = "tags_profile_#{profile.id.to_s}"
26 - if is_cache_expired?(@tags_cache_key, true) 26 + if is_cache_expired?(@tags_cache_key)
27 @tags = profile.article_tags 27 @tags = profile.article_tags
28 end 28 end
29 end 29 end
@@ -31,7 +31,7 @@ class ProfileController < PublicController @@ -31,7 +31,7 @@ class ProfileController < PublicController
31 def content_tagged 31 def content_tagged
32 @tag = params[:id] 32 @tag = params[:id]
33 @tag_cache_key = "tag_#{CGI.escape(@tag.to_s)}_#{profile.id.to_s}_page_#{params[:npage]}" 33 @tag_cache_key = "tag_#{CGI.escape(@tag.to_s)}_#{profile.id.to_s}_page_#{params[:npage]}"
34 - if is_cache_expired?(@tag_cache_key, true) 34 + if is_cache_expired?(@tag_cache_key)
35 @tagged = profile.find_tagged_with(@tag).paginate(:per_page => 20, :page => params[:npage]) 35 @tagged = profile.find_tagged_with(@tag).paginate(:per_page => 20, :page => params[:npage])
36 end 36 end
37 end 37 end
app/helpers/application_helper.rb
  Diff comments   View file @d070eec
@@ -1316,4 +1316,9 @@ module ApplicationHelper @@ -1316,4 +1316,9 @@ module ApplicationHelper
1316 def cache_timeout(key, timeout, &block) 1316 def cache_timeout(key, timeout, &block)
1317 cache(key, { :expires_in => timeout }, &block) 1317 cache(key, { :expires_in => timeout }, &block)
1318 end 1318 end
  1319 +
  1320 + def is_cache_expired?(key)
  1321 + !cache_store.fetch(ActiveSupport::Cache.expand_cache_key(key, :controller))
  1322 + end
  1323 +
1319 end 1324 end