github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: show avatar flair on group, badges and directory pages (#6732)

Browse Source
This commit is contained in:
Maja Komel
2018-12-06 12:18:52 +01:00
committed by Régis Hanol
parent 43cfdb1cb9
commit 1d649e147b
12 changed files with 96 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/user_badges_controller.rb
View File

@ -6,7 +6,7 @@ class UserBadgesController < ApplicationController
badge = fetch_badge_from_params
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.includes(:user, :granted_by, badge: :badge_type, post: :topic, user: :primary_group)
grant_count = nil