github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-14 21:24:06 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "FIX: properly filter badges when they're on a whisper"

Browse Source 
This reverts commit 584a170534.
This commit is contained in:
Sam 2015-09-25 10:22:08 +10:00
parent 584a170534
commit 60a8e203db
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/controllers/user_badges_controller.rb
View File

@ -3,9 +3,8 @@ class UserBadgesController < ApplicationController
params.permit [:granted_before, :offset]
badge = fetch_badge_from_params
user_badges = filter_user_badges(badge.user_badges)
user_badges = badge.user_badges.order('granted_at DESC, id DESC').limit(96)
user_badges = user_badges.includes(:user, :granted_by, badge: :badge_type, post: :topic)
user_badges = user_badges.order(granted_at: :desc, id: :desc).limit(96)
if offset = params[:offset]
user_badges = user_badges.offset(offset.to_i)
@ -18,16 +17,17 @@ class UserBadgesController < ApplicationController
params.permit [:grouped]
user = fetch_user_from_params
user_badges = filter_user_badges(user.user_badges)
user_badges = user_badges.includes(badge: [:badge_grouping, :badge_type])
.includes(post: :topic)
.includes(:granted_by)
user_badges = user.user_badges
if params[:grouped]
user_badges = user_badges.group(:badge_id)
.select(UserBadge.attribute_names.map {|x| "MAX(#{x}) as #{x}" }, 'COUNT(*) as count')
end
user_badges = user_badges.includes(badge: [:badge_grouping, :badge_type])
.includes(post: :topic)
.includes(:granted_by)
render_serialized(user_badges, DetailedUserBadgeSerializer, root: "user_badges")
end
@ -94,15 +94,4 @@ class UserBadgesController < ApplicationController
master_api_call = current_user.nil? && is_api?
master_api_call or guardian.can_grant_badges?(user)
end
def filter_user_badges(user_badges)
if SiteSetting.enable_whispers?
unless current_user.try(:staff?)
user_badges = user_badges.joins("LEFT JOIN posts ON posts.id = user_badges.post_id")
.where("posts.post_type <> #{Post.types[:whisper]}")
end
end
user_badges
end
end