From cc70d1d22e445e3e9c6514c0d2a0e454b9c999c9 Mon Sep 17 00:00:00 2001 From: "Parth Gajjar (Open ERP)" Date: Tue, 4 Mar 2014 12:31:04 +0530 Subject: [PATCH] [IMP] replaced calendar icon with map and cloud, top and bottom margin added, domain added for confirmed events, used font-awesome instead of block-country_event.png bzr revid: pga@tinyerp.com-20140304070104-3pb9hpnkgke6peu9 --- .../src/img/blocks/block-country_events.png | Bin 790 -> 0 bytes addons/website_event/controllers/main.py | 12 +++---- addons/website_event/views/website_event.xml | 34 +++++++++++------- 3 files changed, 27 insertions(+), 19 deletions(-) delete mode 100644 addons/website/static/src/img/blocks/block-country_events.png diff --git a/addons/website/static/src/img/blocks/block-country_events.png b/addons/website/static/src/img/blocks/block-country_events.png deleted file mode 100644 index 52254ba4c3e96f80f0aeed224a03af32d3a659d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 790 zcmeAS@N?(olHy`uVBq!ia0vp^DM0Mc!3HE{I};W%FfiTqba4!+xb^n-Z~ve|iQ|R; zUwFA3;Mu)q&Wfv1m7T6%otG}vyIiMrh3U}gn12(R($1O8Q3#*g;D7)9&8!(7v&8+{ zzo%E%B^F5Bzy7mm-ofHmEi<%Abr=;`1ROeMI(8jh^ybZ*4Y$%5PNo*<|3%J#d_^^XLHT*bR>uMU0D%lNt_ zoMlBwS@`5VpMR$o7k^%F?QSmpSXjR2`kzV}@AAm_D>I{iCEj0cyx+uf>tv>b5A2m? z!usdgOr4RX^(B1Xv5RZV^|t5Qd@Cy0@aWuTla77Urqtb7fBN*X$E;f&(isb-LMJQ4 z%|Aay!j${cgA&FhHG$cOIXM&>7?^Mp9y5z#3#CiLB&N-?vefL5Q=T<*?$oVcOHZb3 z4$_&aa`O4-O;dfmN-{m??SEly*fOuL($qrbWD3`WORshmhpR1LraIM6{&nq_i2nMT zLlU93d@cX9D_?xwVAz|~7Q(ya`mS{W8;g%%8OUIrTDyE;9*kr#PHfI zCPg&Am@+NOU$(_M_L!{quX458{|YOWI2c(3fc`z=q_EX)2LsgOC6OhOVBr?M*Y$5N wF#y##Ffg|0b?bEl0|%@FqK!ph^>g)u=TG?^Jp9EHnBEyYUHx3vIVCg!0K!IH$N&HU diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py index 26a1e732ad8..175e4dc13d9 100644 --- a/addons/website_event/controllers/main.py +++ b/addons/website_event/controllers/main.py @@ -221,15 +221,15 @@ class website_event(http.Controller): event_obj = request.registry['event.event'] cr, uid, context,event_ids = request.cr, request.uid, request.context,[] country_code = self.get_visitors_country()['country_code'] - result = {'events':[]} + result = {'events':[],'country':False} if country_code: country_ids = country_obj.search(request.cr, request.uid, [('code', '=', country_code)], context=request.context) - result['country'] = country_obj.browse(request.cr, request.uid, country_ids[0], context=request.context) - event_ids = event_obj.search(request.cr, request.uid, ['|', ('address_id', '=', None),('country_id.code', '=', country_code),('date_begin','>=', time.strftime('%Y-%m-%d 00:00:00'))], order="date_begin", context=request.context) + event_ids = event_obj.search(request.cr, request.uid, ['|', ('address_id', '=', None),('country_id.code', '=', country_code),('date_begin','>=', time.strftime('%Y-%m-%d 00:00:00')),('state', '=', 'confirm')], order="date_begin", context=request.context) if not event_ids: - event_ids = event_obj.search(request.cr, request.uid, [('date_begin','>=', time.strftime('%Y-%m-%d 00:00:00'))], order="date_begin", context=request.context) - result['country'] = False - for event in event_obj.browse(request.cr, request.uid, event_ids, context=request.context): + event_ids = event_obj.search(request.cr, request.uid, [('date_begin','>=', time.strftime('%Y-%m-%d 00:00:00')),('state', '=', 'confirm')], order="date_begin", context=request.context) + for event in event_obj.browse(request.cr, request.uid, event_ids, context=request.context)[:6]: + if country_code and event.country_id.code == country_code: + result['country'] = country_obj.browse(request.cr, request.uid, country_ids[0], context=request.context) result['events'].append({ "date": self.get_formated_date(event), "event": event, diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml index 5c5c2fedfd3..74108e36937 100644 --- a/addons/website_event/views/website_event.xml +++ b/addons/website_event/views/website_event.xml @@ -120,7 +120,7 @@