summaryrefslogtreecommitdiff
path: root/addons/website_forum
diff options
context:
space:
mode:
authorChristophe Matthieu <chm@odoo.com>2016-03-23 11:20:57 +0100
committerChristophe Matthieu <chm@odoo.com>2016-03-23 11:21:57 +0100
commit00f01b8b1d359df42e7b42891bf3bfd3cc85b921 (patch)
treecd04e5281903046625a844a715f607da786ae466 /addons/website_forum
parentf1514bf01cdf1f10e14ee3f247624678b4ca099a (diff)
[IMP] website_forum: remove le list of the user per badge
(6 minutes to load all avatar for some page, no sense to display all users)
Diffstat (limited to 'addons/website_forum')
-rw-r--r--addons/website_forum/controllers/main.py10
-rw-r--r--addons/website_forum/views/website_forum.xml39
2 files changed, 4 insertions, 45 deletions
diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 4874879a178..da4fa4642a1 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -715,16 +715,6 @@ class WebsiteForum(http.Controller):
})
return request.website.render("website_forum.badge", values)
- @http.route(['''/forum/<model("forum.forum"):forum>/badge/<model("gamification.badge"):badge>'''], type='http', auth="public", website=True)
- def badge_users(self, forum, badge, **kwargs):
- users = [badge_user.user_id for badge_user in badge.sudo().owner_ids]
- values = self._prepare_forum_values(forum=forum, searches={'badges': True})
- values.update({
- 'badge': badge,
- 'users': users,
- })
- return request.website.render("website_forum.badge_user", values)
-
# Messaging
# --------------------------------------------------
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 66902c2d2fb..fe70723c2f2 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -1136,12 +1136,12 @@
<table class="table mt32 mb64">
<tr t-foreach="badges" t-as="badge">
<td>
- <a t-attf-href="/forum/#{ slug(forum) }/badge/#{ slug(badge) }" class="badge pull-left">
+ <span class="badge pull-left">
<span t-if="badge.level == 'gold'" class="fa fa-circle badge-gold"/>
<span t-if="badge.level == 'silver'" class="fa fa-circle badge-silver"/>
<span t-if="badge.level == 'bronze'" class="fa fa-circle badge-bronze"/>
<span> </span><span t-field="badge.name"/>
- </a>
+ </span>
</td><td>
<b t-esc="badge.stat_count_distinct"/>
<i class="text-muted"> awarded users</i>
@@ -1153,37 +1153,6 @@
</t>
</template>
-<template id="badge_user">
- <t t-call="website_forum.header">
- <h3 class="mt32 mb32">
- <b>Badge "<span t-field="badge.name"/>"</b>
- </h3>
- <div>
- <div class="pull-left badge">
- <span t-if="badge.level == 'gold'" class="fa fa-circle badge-gold"/>
- <span t-if="badge.level == 'silver'" class="fa fa-circle badge-silver"/>
- <span t-if="badge.level == 'bronze'" class="fa fa-circle badge-bronze"/>
- <span> </span><span t-field="badge.name"/>
- </div>
- <span t-field="badge.description" style="margin-left:20px"/>
- </div>
- <h4 class="mt32">
- <t class="pull-left" t-esc="badge.stat_count_distinct"/>
- <span t-if="badge.stat_count_distinct&gt;1"> users</span>
- <span t-if="badge.stat_count_distinct&lt;=1"> user</span>
- received this badge:
- </h4>
- <div class="row">
- <div class="col-sm-3 mt16" t-foreach="users" t-as="user">
- <img class="pull-left img img-circle o_forum_avatar" t-attf-src="/forum/user/#{user.id}/avatar"/>
- <div>
- <a t-attf-href="/forum/#{slug(forum)}/user/#{user.id}" t-field="user.name"/>
- </div>
- </div>
- </div>
- </t>
-</template>
-
<template id="moderation_queue">
<t t-call="website_forum.header">
<h2 class="page-header mt0">
@@ -1498,12 +1467,12 @@
<table class="table mt32 mb64">
<tr t-foreach="user.badge_ids" t-as="badge">
<td>
- <a t-attf-href="/forum/#{ slug(forum) }/badge/#{ slug(badge.badge_id) }" class="badge pull-left">
+ <span class="badge pull-left">
<span t-if="badge.badge_id.level == 'gold'" class="fa fa-circle badge-gold"/>
<span t-if="badge.badge_id.level == 'silver'" class="fa fa-circle badge-silver"/>
<span t-if="badge.badge_id.level == 'bronze'" class="fa fa-circle badge-bronze"/>
<span t-field="badge.badge_id.name"/>
- </a>
+ </span>
</td><td>
<b t-esc="badge.badge_id.stat_count_distinct"/>
<i class="text-muted">awarded users</i>