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

[FIX] website_slides: handle "My courses" to filter user's channels

Browse Source 
Purpose: the "My courses" button on the slides home page now redirects the user
to the list of channels for which he is a member of.

In this commit we also clean a bit controller code to remove support of
category_id which makes no sense on a page displaying courses as categories
are not cross-courses, only course-specific.

A clear search icon is also added.

Commit linked to task ID 1941250 and PR #31317.
This commit is contained in:
Aurélien Warnon
2019-02-21 16:38:11 +00:00
committed by Thibault Delavallée
parent 9f74ccf403
commit 55f93a240f
2 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_slides/controllers/main.py
+21 -13
View File
@@ -100,9 +100,8 @@ class WebsiteSlides(WebsiteProfile):
tags |= search_tag
return tags
def _build_channel_domain(self, base_domain, slide_type=None, **post):
def _build_channel_domain(self, base_domain, slide_type=None, my=False, **post):
search_term = post.get('search')
category_id = post.get('category_id')
channel_tag_id = post.get('channel_tag_id')
tags = self._extract_channel_tag_search(**post)
@@ -111,15 +110,16 @@ class WebsiteSlides(WebsiteProfile):
domain = expression.AND([
domain,
['|', ('name', 'ilike', search_term), ('description', 'ilike', search_term)]])
if category_id:
domain = expression.AND([domain, [('category_ids', 'in', [category_id])]])
elif channel_tag_id:
if channel_tag_id:
domain = expression.AND([domain, [('tag_ids', 'in', [channel_tag_id])]])
elif tags:
domain = expression.AND([domain, [('tag_ids', 'in', tags.ids)]])
if slide_type and 'nbr_%s' % slide_type in request.env['slide.channel']:
domain = expression.AND([domain, [('nbr_%s' % slide_type, '>', 0)]])
if my:
domain = expression.AND([domain, [('partner_ids', '=', request.env.user.partner_id.id)]])
return domain
def _prepare_channel_values(self, **kwargs):
@@ -179,19 +179,24 @@ class WebsiteSlides(WebsiteProfile):
})
@http.route('/slides/all', type='http', auth="public", website=True)
def slides_channel_all(self, slide_type=None, **post):
def slides_channel_all(self, slide_type=None, my=False, **post):
""" Home page displaying a list of courses displayed according to some
criterion and search terms.
: param string slide_type: if provided, filter the slide.channels
to contain at least one slide of type 'slide_type'
: param dict post: post parameters, including
* search_term: keywords entered in the search box, used to filter on slide content;
* category_id: id of a slide.category;
* channel_tag_id: id of a channel.tag;
:param string slide_type: if provided, filter the course to contain at
least one slide of type 'slide_type'. Used notably to display courses
with certifications;
:param bool my: if provided, filter the slide.channels for which the
current user is a member of
:param dict post: post parameters, including
* ``search``: filter on course description / name;
* ``channel_tag_id``: filter on courses containing this tag;
* ``channel_tag_group_id_<id>``: filter on courses containing this tag
in the tag group given by <id> (used in navigation based on tag group);
"""
domain = request.website.website_domain()
domain = self._build_channel_domain(domain, slide_type=slide_type, **post)
domain = self._build_channel_domain(domain, slide_type=slide_type, my=my, **post)
order = self._channel_order_by_criterion.get(post.get('sorting', 'date'), 'create_date desc')
@@ -207,7 +212,10 @@ class WebsiteSlides(WebsiteProfile):
'channels': channels,
'tag_groups': tag_groups,
'search_term': post.get('search'),
'search_slide_type': slide_type,
'search_my': my,
'search_tags': search_tags,
'search_channel_tag_id': post.get('channel_tag_id'),
})
def _prepare_additional_channel_values(self, values, **kwargs):
addons/website_slides/views/website_slides_templates_homepage.xml
+15 -3
View File
@@ -33,7 +33,11 @@
<a class="nav-link nav-link mr-md-2 o_wslides_home_all_slides" href="/slides/all"><i class="fa fa-graduation-cap mr-1"/>All courses</a>
</div>
<div class="navbar-nav o_wslides_nav_navbar_right">
<a class="nav-link nav-link" href="/slides/all"><i class="fa fa-file mr-1"/>My courses</a>
<t t-if="is_public_user">
<a class="nav-link nav-link" href="/web/login?redirect=/slides/all?my=1"><i class="fa fa-file mr-1"/>My courses</a>
</t><t t-else="">
<a class="nav-link nav-link" href="/slides/all?my=1"><i class="fa fa-file mr-1"/>My courses</a>
</t>
</div>
</div>
</nav>
@@ -124,7 +128,7 @@
<div class="wrap o_wslides_wrap">
<section class="s_banner bg-900" style="background-image: url(&quot;/website_slides/static/src/img/banner_default_all.svg&quot;); background-size: cover; background-position: 80% 20%">
<div class="container py-5">
<h1 class="display-3 mb-0">All Courses</h1>
<h1 class="display-3 mb-0"><t t-if="search_my">My Courses</t><t t-else="">All Courses</t></h1>
<h3 class="mb-4">Start your online course today !</h3>
</div>
</section>
@@ -161,10 +165,18 @@
</t>
<!-- karma / profile -->
<li class="nav-item ml-auto" t-if="not is_public_user">
<a t-att-href="'/profile/user/%s' % user.id" class="nav-link mr-2">
<a t-att-href="'/profile/user/%s' % user.id" class="nav-link mr-2"
role="button" title="My Profile">
<i class="fa fa-diamond"/> <t t-esc="user_id.karma"/>
</a>
</li>
<!-- clear filtering -->
<li class="nav-item" t-if="search_slide_type or search_my or search_tags or search_channel_tag_id">
<a t-att-href="'/slides/all?%s' % keep_query('debug')" class="nav-link mr-2"
role="button" title="Clear filters">
<i class="fa fa-eraser"/>
</a>
</li>
</ul>
<!-- search box -->
<form method="GET" class="form-inline o_wslides_nav_navbar_right">