diff --git a/app/models/concerns/conflictable.rb b/app/models/concerns/conflictable.rb new file mode 100644 index 000000000..a1926aa36 --- /dev/null +++ b/app/models/concerns/conflictable.rb @@ -0,0 +1,9 @@ +module Conflictable + extend ActiveSupport::Concern + + def conflictive? + return false unless flags_count > 0 && cached_votes_up > 0 + cached_votes_up/flags_count.to_f < 5 + end + +end diff --git a/app/models/debate.rb b/app/models/debate.rb index 4e495281f..c29b54ae8 100644 --- a/app/models/debate.rb +++ b/app/models/debate.rb @@ -2,6 +2,7 @@ require 'numeric' class Debate < ActiveRecord::Base include Flaggable include Taggable + include Conflictable apply_simple_captcha @@ -110,11 +111,6 @@ class Debate < ActiveRecord::Base where(id: [debate_ids, tag_ids].flatten.compact) end - def conflictive? - return false unless flags_count > 0 && cached_votes_up > 0 - cached_votes_up/flags_count.to_f < 5 - end - def after_hide self.tags.each{ |t| t.decrement_custom_counter_for('Debate') } end diff --git a/app/models/proposal.rb b/app/models/proposal.rb index f2693d8ad..48e149821 100644 --- a/app/models/proposal.rb +++ b/app/models/proposal.rb @@ -1,7 +1,7 @@ class Proposal < ActiveRecord::Base include Flaggable include Taggable - + include Conflictable apply_simple_captcha acts_as_votable @@ -42,11 +42,6 @@ class Proposal < ActiveRecord::Base cached_votes_up end - def conflictive? - return false unless flags_count > 0 && cached_votes_up > 0 - cached_votes_up/flags_count.to_f < 5 - end - def description super.try :html_safe end