Download as
Browse Code »

Commit 33c30b1b4b920acdd6cf575e4e4eaa72637bfb13

Authored by Rodrigo Souto
1 parent c3fe8740
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

[tolerance-time] Fixing expiration logic

Showing 1 changed file with 2 additions and 1 deletions   Show diff stats
plugins/tolerance_time/lib/tolerance_time_plugin.rb
  Diff comments   View file @33c30b1
@@ -13,7 +13,8 @@ class ToleranceTimePlugin < Noosfero::Plugin @@ -13,7 +13,8 @@ class ToleranceTimePlugin < Noosfero::Plugin
13 13
14 def self.expired?(content) 14 def self.expired?(content)
15 publication = ToleranceTimePlugin::Publication.find_by_target(content) 15 publication = ToleranceTimePlugin::Publication.find_by_target(content)
16 - (content.kind_of?(Comment) || (!content.folder? && content.published?)) && (!publication.present? || publication.expired?) 16 + (content.kind_of?(Comment) || (!content.folder? && content.published?)) &&
  17 + ((!publication.present? && !content.profile.kind_of?(Person)) || (publication.present? && publication.expired?))
17 end 18 end
18 19
19 def control_panel_buttons 20 def control_panel_buttons