Download as
Browse Code »

Commit 33c30b1b4b920acdd6cf575e4e4eaa72637bfb13

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

[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