Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upcomming events fixed #1021

Merged
merged 1 commit into from Jun 19, 2016
Merged

upcomming events fixed #1021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions open_event/helpers/cities.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions open_event/helpers/data_getter.py
View file
Open in desktop
Expand Up @@ -268,6 +268,7 @@ def get_all_published_events(include_private=False):
events = Event.query.filter(Event.state == 'Published')
else:
events = Event.query.filter(Event.state == 'Published').filter(Event.privacy != 'private')
events = events.filter(Event.start_time >= datetime.datetime.now()).filter(Event.end_time >= datetime.datetime.now())
return events

@staticmethod
Expand Down