From 4156162f1227c59ea98fe371e05dc9cf61b39dd5 Mon Sep 17 00:00:00 2001 From: coderkun Date: Fri, 25 Apr 2014 02:45:02 +0200 Subject: [PATCH] only show users for Achievements ranking --- models/CharactersModel.inc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/models/CharactersModel.inc b/models/CharactersModel.inc index eb7c1531..329a7403 100644 --- a/models/CharactersModel.inc +++ b/models/CharactersModel.inc @@ -186,15 +186,18 @@ return $this->db->query( 'SELECT characters.id, characters.created, characters.charactertype_id, characters.name, characters.url, characters.user_id, characters.xps, characters.xplevel, characters.avatar_id, charactertypes.name AS charactertype_name, charactertypes.url AS charactertype_url, count(DISTINCT achievement_id) AS c '. 'FROM achievements_characters '. - 'LEFT JOIN achievements ON achievements.id = achievements_characters.achievement_id '. - 'LEFT JOIN v_characters AS characters ON characters.id = achievements_characters.character_id '. - 'LEFT JOIN charactertypes ON charactertypes.id = characters.charactertype_id '. + 'INNER JOIN achievements ON achievements.id = achievements_characters.achievement_id '. + 'INNER JOIN v_characters AS characters ON characters.id = achievements_characters.character_id '. + 'INNER JOIN characters_characterroles ON characters_characterroles.character_id = characters.id '. + 'INNER JOIN characterroles ON characterroles.id = characters_characterroles.characterrole_id AND characterroles.name = ? '. + 'INNER JOIN charactertypes ON charactertypes.id = characters.charactertype_id '. 'WHERE achievements.seminary_id = ? AND deadline IS NULL '. (!$alsoWithDeadline ? 'AND achievements.deadline IS NULL ' : null). - 'GROUP BY character_id '. - 'ORDER BY count(DISTINCT achievement_id) DESC '. + 'GROUP BY achievements_characters.character_id '. + 'ORDER BY count(DISTINCT achievements_characters.achievement_id) DESC '. 'LIMIT ?', - 'ii', + 'sii', + 'user', $seminaryId, $count );