deblan/journalduhacker
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Tag: remove accessible_to, use valid_for?

Browse source 
They do the same thing now but a scope might be too limited in the
future so just pick one now.

Closes #100
This commit is contained in:
joshua stein 2015-07-24 00:18:30 -05:00
parent 434ad81752
commit 6cc5f196bf
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/models/tag.rb
View file

@ -6,10 +6,6 @@ class Tag < ActiveRecord::Base
attr_accessor :filtered_count, :stories_count
scope :accessible_to, ->(user) do
user && user.is_moderator?? all : where(:privileged => false)
end
scope :active, -> { where(:inactive => false) }
def to_param
@ -19,7 +15,7 @@ class Tag < ActiveRecord::Base
def self.all_with_filtered_counts_for(user)
counts = TagFilter.group(:tag_id).count
Tag.active.order(:tag).accessible_to(user).map{|t|
Tag.active.order(:tag).select{|t| t.valid_for?(user) }.map{|t|
t.filtered_count = counts[t.id].to_i
t
}
@ -28,10 +24,10 @@ class Tag < ActiveRecord::Base
def self.all_with_story_counts_for(user)
counts = Tagging.group(:tag_id).count
Tag.active.order(:tag).accessible_to(user).map{|t|
Tag.active.order(:tag).select{|t| t.valid_for?(user) }.map{|t|
t.stories_count = counts[t.id].to_i
t
}
}
end
def css_class
@ -40,7 +36,7 @@ class Tag < ActiveRecord::Base
def valid_for?(user)
if self.privileged?
user.is_moderator?
!!user.try(:is_moderator?)
else
true
end