pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] website_slide: add toggle button achievement

Browse Source 
Add an option to add the latest achievements in the right sidebar.

closes odoo/odoo#36870

Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
This commit is contained in:
laa
2019-09-13 13:05:31 +00:00
parent a9b7628706
commit 443b44c971
2 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_slides/controllers/main.py
+1 -4
View File
@@ -245,13 +245,11 @@ class WebsiteSlides(WebsiteProfile):
channels_popular = channels_all.sorted('total_votes', reverse=True)[:3]
channels_newest = channels_all.sorted('create_date', reverse=True)[:3]
# fetch 'latests achievements' for non logged people
achievements = request.env['gamification.badge.user'].sudo().search([('badge_id.is_published', '=', True)], limit=5)
if request.env.user._is_public():
achievements = request.env['gamification.badge.user'].sudo().search([('badge_id.is_published', '=', True)], limit=5)
challenges = None
challenges_done = None
else:
achievements = None
challenges = request.env['gamification.challenge'].sudo().search([
('category', '=', 'slides'),
('reward_id.is_published', '=', True)
@@ -262,7 +260,6 @@ class WebsiteSlides(WebsiteProfile):
('badge_id.is_published', '=', True)
]).mapped('challenge_id')
# fetch 'heroes of the week' for non logged people
users = request.env['res.users'].sudo().search([
('karma', '>', 0),
('website_published', '=', True)], limit=5, order='karma desc')
addons/website_slides/views/website_slides_templates_homepage.xml
+26 -13
View File
@@ -81,19 +81,24 @@
<div class="container o_wslides_home_main">
<div class="row">
<div t-if="is_public_user" class="col-lg-3 order-3 order-lg-2">
<div class="row">
<div class="col-12 col-md-7 col-lg-12">
<t t-call="website_slides.slides_home_achievements_small"/>
</div>
<div class="col-12 col-md-5 col-lg-12 mt-5 mt-md-0">
<div class="pl-md-5 pl-lg-0 mt-lg-4">
<t t-call="website_slides.slides_home_users_small"/>
<t t-set="is_achievements_active" t-value="request.website.viewref('website_slides.toggle_latest_achievements').active"/>
<t t-set="has_side_column" t-value="request.website.viewref('website_slides.toggle_leaderboard').active or is_achievements_active"/>
<t t-if="is_public_user">
<div t-if="has_side_column" class="col-lg-3 order-3 order-lg-2">
<div class="row">
<div class="col-12 col-md-7 col-lg-12">
<t t-call="website_slides.slides_home_achievements_small"/>
</div>
<div class="col-12 col-md-5 col-lg-12 mt-5 mt-md-0">
<div t-att-class="'pl-md-5 pl-lg-0 mt-lg-4' if is_achievements_active else 'pl-md-5 pl-lg-0'">
<t t-call="website_slides.slides_home_users_small"/>
</div>
</div>
</div>
</div>
</div>
</t>
<div t-else="" class="col-lg-3 order-lg-2">
<t t-set="has_side_column" t-value="True"/>
<div class="o_wslides_home_aside_loggedin card p-3 p-lg-0 mb-4">
<div class="o_wslides_home_aside_title">
<div class="d-flex align-items-center">
@@ -116,6 +121,9 @@
<div class="col-12 col-sm-6 col-lg-12 d-flex align-items-center">
<t t-call="website_slides.slides_home_user_achievements_small"/>
</div>
<div class="col-12 col-md-7 col-lg-12 pl-md-5 pl-lg-0 mt-lg-4">
<t t-call="website_slides.slides_home_achievements_small"/>
</div>
<div class="col-12 col-sm-6 col-lg-12 pl-md-5 pl-lg-0 mt-lg-4">
<t t-call="website_slides.slides_home_users_small"/>
</div>
@@ -123,7 +131,7 @@
</div>
</div>
</div>
<div class="col-lg-9 pr-lg-5 order-lg-1">
<div t-att-class="'col-lg-9 pr-lg-5 order-lg-1' if has_side_column else 'col-lg pr-lg'">
<div class="o_wslides_home_content_section mb-3"
t-if="not channels_popular">
<p class="h2">No Course created yet.</p>
@@ -336,8 +344,13 @@
</div>
</template>
<template id='slides_home_achievements_small' name="Latest Achievements">
<div class="o_wslides_home_aside">
<template id='slides_home_achievements_small' name="Users">
<t class="o_wslides_home_aside">
</t>
</template>
<template id="toggle_latest_achievements" inherit_id="website_slides.slides_home_achievements_small" active="True" customize_show="True" name='Display Achievements'>
<xpath expr="//t[hasclass('o_wslides_home_aside')]" position="inside">
<div class="row o_wslides_home_aside_title">
<div class="col">
<h5 class="m-0">Latest achievements</h5>
@@ -354,7 +367,7 @@
</t>
<t t-else=""><p class="col mt8">No achievements currently :(</p></t>
</div>
</div>
</xpath>
</template>
<template id='achievement_card' name="Achivement Card">