From 8ecff655e010f3bb62410c77ca0af85ce468510f Mon Sep 17 00:00:00 2001 From: sri-odoo Date: Tue, 26 Feb 2019 09:12:52 +0000 Subject: [PATCH] [IMP] website_profile: merge ranks/badges pages Merge ranks & badges pages. This commit adapt the final page layout, controllers and templates. Added the badge category filter. If used in url parameter, hide ranks and show only the badge part of the page, filtered on matching badge_category. Task ID : 1941250 PR #31567 Co-authored-by: @stefanorigano Co-authored-by: @dbeguin --- addons/website_forum/views/website_forum.xml | 2 +- addons/website_profile/controllers/main.py | 32 +++--- .../website_profile/views/website_profile.xml | 107 ++++++++---------- .../website_slides_templates_homepage.xml | 2 +- 4 files changed, 65 insertions(+), 78 deletions(-) diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml index 1c4755f7092..de04744ffb9 100644 --- a/addons/website_forum/views/website_forum.xml +++ b/addons/website_forum/views/website_forum.xml @@ -161,7 +161,7 @@ t-attf-class="nav-link #{searches.get('tags') and 'active' or ''}">Tags
  • - Badges
  • diff --git a/addons/website_profile/controllers/main.py b/addons/website_profile/controllers/main.py index de56318e7c6..9c6d31c2efc 100644 --- a/addons/website_profile/controllers/main.py +++ b/addons/website_profile/controllers/main.py @@ -163,40 +163,36 @@ class WebsiteProfile(http.Controller): return werkzeug.utils.redirect("/profile/user/%d?%s" % (user.id, kwargs['url_param'])) else: return werkzeug.utils.redirect("/profile/user/%d" % user.id) - # Ranks - # --------------------------------------------------- - @http.route('/profile/ranks', type='http', auth="public", website=True) - def ranks(self, **kwargs): - Rank = request.env['gamification.karma.rank'] - ranks = Rank.sudo().search([]) - ranks = ranks.sorted(key=lambda b: b.karma_min) - values = { - 'ranks': ranks, - 'user': request.env.user, - } - return request.render("website_profile.rank_main", values) - # Badges + # Ranks and Badges # --------------------------------------------------- def _prepare_badges_domain(self, **kwargs): """ Hook for other modules to restrict the badges showed on profile page, depending of the context """ domain = [('website_published', '=', True)] - if 'category' in kwargs: - domain = expression.AND([[('challenge_ids.category', '=', kwargs.get('category'))], domain]) + if 'badge_category' in kwargs: + domain = expression.AND([[('challenge_ids.category', '=', kwargs.get('badge_category'))], domain]) return domain - @http.route('/profile/badge', type='http', auth="public", website=True) - def badges(self, **kwargs): + @http.route('/profile/ranks_badges', type='http', auth="public", website=True) + def view_ranks_badges(self, **kwargs): + ranks = [] + if 'badge_category' not in kwargs: + Rank = request.env['gamification.karma.rank'] + ranks = Rank.sudo().search([], order='karma_min DESC') + Badge = request.env['gamification.badge'] badges = Badge.sudo().search(self._prepare_badges_domain(**kwargs)) badges = sorted(badges, key=lambda b: b.stat_count_distinct, reverse=True) values = self._prepare_user_values(searches={'badges': True}) + values.update({ + 'ranks': ranks, 'badges': badges, + 'user': request.env.user, }) - return request.render("website_profile.badge_main", values) + return request.render("website_profile.rank_badge_main", values) # All Users Page # --------------------------------------------------- diff --git a/addons/website_profile/views/website_profile.xml b/addons/website_profile/views/website_profile.xml index b115d553e8a..c92f12e1e19 100644 --- a/addons/website_profile/views/website_profile.xml +++ b/addons/website_profile/views/website_profile.xml @@ -179,7 +179,7 @@
    Rank: - +
    @@ -288,18 +288,18 @@

    No badge yet

    - Check available badges - Check all available badges + Check available badges + Check all available badges
    - -