summaryrefslogtreecommitdiff
path: root/addons/website_profile/controllers/main.py
diff options
context:
space:
mode:
authorJeremy Kersten <jke@odoo.com>2019-05-28 08:54:43 +0000
committerJeremy Kersten <jke@odoo.com>2019-05-28 09:51:38 +0000
commit9f56353b799c490a444385be35817dccabbccc9a (patch)
treead83a5eb544985a74bf3d7c677e182115156d46f /addons/website_profile/controllers/main.py
parentc5bab6e240c3401e52f13c697f084b170145d520 (diff)
[FIX] w_profile: don't call _get_users_karma_position without users
Before this commit, if you was searching something that return no results, you will call the sql query generating an error syntax: Traceback: ERROR: syntax error at or near ")" LINE 8: WHERE sub.id IN () Now, we don't make more useless query if we know that there are no users. + preventive fix the call of this method without user_ids This commit is related to #14667 closes odoo/odoo#33715 Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
Diffstat (limited to 'addons/website_profile/controllers/main.py')
-rw-r--r--addons/website_profile/controllers/main.py40
1 files changed, 24 insertions, 16 deletions
diff --git a/addons/website_profile/controllers/main.py b/addons/website_profile/controllers/main.py
index 53f8ab88787..64e6b913c98 100644
--- a/addons/website_profile/controllers/main.py
+++ b/addons/website_profile/controllers/main.py
@@ -219,27 +219,35 @@ class WebsiteProfile(http.Controller):
dom = expression.AND([['|', ('name', 'ilike', search_term), ('company_id.name', 'ilike', search_term)], dom])
user_count = User.sudo().search_count(dom)
- page_count = math.ceil(user_count / self._users_per_page)
- pager = request.website.pager(url="/profile/users", total=user_count, page=page, step=self._users_per_page,
- scope=page_count if page_count < self._pager_max_pages else self._pager_max_pages)
- users = User.sudo().search(dom, limit=self._users_per_page, offset=pager['offset'], order='karma DESC')
- user_values = [self._prepare_all_users_values(user) for user in users]
-
- # Get karma position for users (only website_published)
- position_domain = [('karma', '>', 1), ('website_published', '=', True)]
- position_map = self._get_users_karma_position(position_domain, users.ids)
- for user in user_values:
- user['position'] = position_map.get(user['id'], 0)
+ if user_count:
+ page_count = math.ceil(user_count / self._users_per_page)
+ pager = request.website.pager(url="/profile/users", total=user_count, page=page, step=self._users_per_page,
+ scope=page_count if page_count < self._pager_max_pages else self._pager_max_pages)
+
+ users = User.sudo().search(dom, limit=self._users_per_page, offset=pager['offset'], order='karma DESC')
+ user_values = [self._prepare_all_users_values(user) for user in users]
+
+ # Get karma position for users (only website_published)
+ position_domain = [('karma', '>', 1), ('website_published', '=', True)]
+ position_map = self._get_users_karma_position(position_domain, users.ids)
+ for user in user_values:
+ user['position'] = position_map.get(user['id'], 0)
+
+ values = {
+ 'top3_users': user_values[:3] if not search_term and page == 1 else None,
+ 'users': user_values[3:] if not search_term and page == 1 else user_values,
+ 'pager': pager
+ }
+ else:
+ values = {'top3_users': [], 'users': [], 'pager': dict(page_count=0)}
- values = {
- 'top3_users': user_values[:3] if not search_term and page == 1 else None,
- 'users': user_values[3:] if not search_term and page == 1 else user_values,
- 'pager': pager
- }
return request.render("website_profile.users_page_main", values)
def _get_users_karma_position(self, domain, user_ids):
+ if not user_ids:
+ return {}
+
Users = request.env['res.users']
where_query = Users._where_calc(domain)
Users._apply_ir_rules(where_query, 'read')