From 541cfc93a3a871f1d747eea9bfcda71ec05708b1 Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Mon, 11 Aug 2014 17:15:57 +0200 Subject: [PATCH] [FIX] website_event: show online in event in all country. Add filter online event. Keep the date between filter. --- addons/website_event/controllers/main.py | 7 +++++-- addons/website_event/views/website_event.xml | 9 ++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py index 2a6e1d134e3..2ceac516351 100644 --- a/addons/website_event/controllers/main.py +++ b/addons/website_event/controllers/main.py @@ -90,9 +90,12 @@ class website_event(http.Controller): if searches["type"] != 'all': current_type = type_obj.browse(cr, uid, int(searches['type']), context=context) domain_search["type"] = [("type", "=", int(searches["type"]))] - if searches["country"] != 'all': + + if searches["country"] != 'all' and searches["country"] != 'online': current_country = country_obj.browse(cr, uid, int(searches['country']), context=context) - domain_search["country"] = [("country_id", "=", int(searches["country"]))] + domain_search["country"] = ['|', ("country_id", "=", int(searches["country"])), ("country_id", "=", False)] + elif searches["country"] == 'online': + domain_search["country"] = [("country_id", "=", False)] def dom_without(without): domain = [('state', "in", ['draft','confirm','done'])] diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml index 6c26ce3f026..4058cccdae7 100644 --- a/addons/website_event/views/website_event.xml +++ b/addons/website_event/views/website_event.xml @@ -58,6 +58,7 @@

+ Online not published

@@ -162,7 +163,13 @@