From 195d7e4a381f11715f85f2c4f06daa89146c3760 Mon Sep 17 00:00:00 2001 From: Roberto Diaz Date: Fri, 26 Oct 2018 10:57:57 +0200 Subject: [PATCH] testing calendar --- genweb/organs/portlets/portlet_calendar.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/genweb/organs/portlets/portlet_calendar.py b/genweb/organs/portlets/portlet_calendar.py index 54fa9d93..781ccc7b 100644 --- a/genweb/organs/portlets/portlet_calendar.py +++ b/genweb/organs/portlets/portlet_calendar.py @@ -235,13 +235,15 @@ def next3Events(self): self.request.form['day']) dateEvent = datetime.strptime(date, formatDate) # Shows only specified date - date_events = {'query': (dateEvent, dateEvent), 'range': 'min:max'} + date_events = {'query': (dateEvent, dateEvent), 'range': 'min'} + limit = 1 else: # TODO.... # Future, show 3 events date = datetime.today().strftime(formatDate) dateEvent = datetime.strptime(date, formatDate) date_events = {'query': (dateEvent), 'range': 'min'} + limit = 3 portal_catalog = getToolByName(self.context, 'portal_catalog') if api.user.is_anonymous(): future_sessions = portal_catalog.unrestrictedSearchResults( @@ -249,13 +251,13 @@ def next3Events(self): sort_on='start', start=date_events, path=self.get_public_organs_fields() - )[:3] + )[:limit] else: future_sessions = portal_catalog.unrestrictedSearchResults( portal_type='genweb.organs.sessio', sort_on='start', start=date_events, - )[:3] + )[:limit] future = [] current_year = datetime.now().strftime('%Y')