diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-05-29 17:34:43 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-05-29 17:34:43 +0200 |
| commit | f36e6917bd73a56dc0c7468b4849920df4088154 (patch) | |
| tree | b63d02ae3e5ffc0815de009407363e0cf906f547 /addons/website_event/controllers | |
| parent | bc0173c2d58ac26d80cb2f483a95c0c13b047dab (diff) | |
| parent | 37eed7c509fb5846c89ef37046df4b3cab299719 (diff) | |
[MERGE] forward port branch saas-11.3 up to 37eed7c509f
Diffstat (limited to 'addons/website_event/controllers')
| -rw-r--r-- | addons/website_event/controllers/main.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py index 33049caffaa..d6e03931722 100644 --- a/addons/website_event/controllers/main.py +++ b/addons/website_event/controllers/main.py @@ -64,7 +64,6 @@ class WebsiteEventController(http.Controller): ] # search domains - # TDE note: WTF ??? current_date = None current_type = None current_country = None @@ -119,9 +118,12 @@ class WebsiteEventController(http.Controller): step=step, scope=5) - order = 'website_published desc, date_begin' + order = 'date_begin' if searches.get('date', 'all') == 'old': - order = 'website_published desc, date_begin desc' + order = 'date_begin desc' + if searches["country"] != 'all': # if we are looking for a specific country + order = 'is_online, ' + order # show physical events first + order = 'website_published desc, ' + order events = Event.search(dom_without("none"), limit=step, offset=pager['offset'], order=order) values = { |