Download as
Browse Code »

Commit 1ceb891ec1bce9d1035c5a8eb8a8a6a6e98acbf2

Authored by Daniela Feitosa
2 parents 86514f9d 1a384d81
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

Merge branch 'stable'

Showing 9 changed files with 26 additions and 16 deletions   Show diff stats
app/controllers/public/home_controller.rb
  Diff comments   View file @1ceb891
... ... @@ -4,7 +4,7 @@ class HomeController < PublicController
4 4 @has_news = false
5 5 if environment.enabled?('use_portal_community') && environment.portal_community
6 6 @has_news = true
7   - @news_cache_key = environment.portal_news_cache_key
  7 + @news_cache_key = environment.portal_news_cache_key(FastGettext.locale)
8 8 if !read_fragment(@news_cache_key)
9 9 portal_community = environment.portal_community
10 10 @highlighted_news = portal_community.news(2, true)
... ...
app/models/environment.rb
  Diff comments   View file @1ceb891
... ... @@ -696,8 +696,8 @@ class Environment < ActiveRecord::Base
696 696 settings[:portal_folders] = folders ? folders.map(&:id) : nil
697 697 end
698 698  
699   - def portal_news_cache_key
700   - "home-page-news/#{cache_key}"
  699 + def portal_news_cache_key(language='en')
  700 + "home-page-news/#{cache_key}-#{language}"
701 701 end
702 702  
703 703 def notification_emails
... ...
app/models/recent_documents_block.rb
  Diff comments   View file @1ceb891
... ... @@ -32,8 +32,4 @@ class RecentDocumentsBlock < Block
32 32 end
33 33 end
34 34  
35   - def timeout
36   - 2.months
37   - end
38   -
39 35 end
... ...
app/sweepers/article_sweeper.rb
  Diff comments   View file @1ceb891
... ... @@ -20,7 +20,9 @@ protected
20 20 BlockSweeper.expire_blocks(blocks)
21 21 env = article.profile.environment
22 22 if env && (env.portal_community == article.profile)
23   - expire_fragment(env.portal_news_cache_key)
  23 + Noosfero.locales.keys.each do |locale|
  24 + expire_fragment(env.portal_news_cache_key(locale))
  25 + end
24 26 end
25 27 end
26 28  
... ...
app/sweepers/block_sweeper.rb
  Diff comments   View file @1ceb891
... ... @@ -5,15 +5,14 @@ class BlockSweeper < ActiveRecord::Observer
5 5 class << self
6 6 include SweeperHelper
7 7  
8   - def cache_key_regex(block)
  8 + # Expire block's all languages cache
  9 + def expire_block(block)
9 10 regex = '-[a-z]*$'
10 11 clean_ck = block.cache_key.gsub(/#{regex}/,'')
11   - %r{#{clean_ck+regex}}
12   - end
13 12  
14   - # Expire block's all languages cache
15   - def expire_block(block)
16   - expire_timeout_fragment(cache_key_regex(block))
  13 + Noosfero.locales.keys.each do |locale|
  14 + expire_timeout_fragment("#{clean_ck}-#{locale}")
  15 + end
17 16 end
18 17  
19 18 def expire_blocks(blocks)
... ...
db/migrate/20120307200651_add_ip_address_to_comment.rb
  Diff comments   View file @1ceb891
... ... @@ -6,6 +6,6 @@ class AddIpAddressToComment &lt; ActiveRecord::Migration
6 6  
7 7 def self.down
8 8 remove_column :comments, :ip_address
9   - remove_column :comments, :boolean
  9 + remove_column :comments, :spam
10 10 end
11 11 end
... ...
debian/changelog
  Diff comments   View file @1ceb891
  1 +noosfero (0.36.5) unstable; urgency=low
  2 +
  3 + * Bugfixes release
  4 +
  5 + -- Daniela Soares Feitosa <daniela@colivre.coop.br> Thu, 26 Apr 2012 00:49:32 -0300
  6 +
  7 +noosfero (0.36.4) unstable; urgency=low
  8 +
  9 + * Bugfix release
  10 +
  11 + -- Daniela Soares Feitosa <daniela@colivre.coop.br> Sat, 21 Apr 2012 10:59:32 -0300
  12 +
1 13 noosfero (0.36.3) unstable; urgency=low
2 14  
3 15 * Bugfixes release
... ...
debian/noosfero.install
  Diff comments   View file @1ceb891
... ... @@ -16,6 +16,7 @@ config/environment.rb usr/share/noosfero/config
16 16 config/environments usr/share/noosfero/config
17 17 config/initializers usr/share/noosfero/config
18 18 config/routes.rb usr/share/noosfero/config
  19 +config/locales/ usr/share/noosfero/config
19 20  
20 21 plugins usr/share/noosfero
21 22  
... ...
lib/noosfero.rb
  Diff comments   View file @1ceb891
... ... @@ -2,7 +2,7 @@ require &#39;fast_gettext&#39;
2 2  
3 3 module Noosfero
4 4 PROJECT = 'noosfero'
5   - VERSION = '0.36.3'
  5 + VERSION = '0.36.5'
6 6  
7 7 def self.pattern_for_controllers_in_directory(dir)
8 8 disjunction = controllers_in_directory(dir).join('|')
... ...