Download as
Browse Code »

Commit 8df53b7e7371e4fd74a8de949eff2e70c8ea0cfb

Authored by Rodrigo Souto
1 parent 0da7313f
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] Refactoring and adding ActionTracker exception

Showing 1 changed file with 7 additions and 2 deletions   Show diff stats
plugins/tolerance_time/lib/tolerance_time_plugin.rb
  Diff comments   View file @8df53b7
... ... @@ -12,9 +12,14 @@ class ToleranceTimePlugin < Noosfero::Plugin
12 12 end
13 13  
14 14 def self.expired?(content)
  15 + return false if content.kind_of?(Comment) && !content.article.kind_of?(Article)
  16 +
  17 + expirable = content.kind_of?(Comment) || (!content.folder? && content.published?)
15 18 publication = ToleranceTimePlugin::Publication.find_by_target(content)
16   - (content.kind_of?(Comment) || (!content.folder? && content.published?)) &&
17   - ((!publication.present? && !content.profile.kind_of?(Person)) || (publication.present? && publication.expired?))
  19 + publication = ToleranceTimePlugin::Publication.create!(:target => content) if expirable && publication.nil?
  20 + person_article = content.kind_of?(Article) && content.profile.kind_of?(Person)
  21 +
  22 + !person_article && expirable && publication.expired?
18 23 end
19 24  
20 25 def control_panel_buttons
... ...