Skip to content

Revert "fix: Return only accepted session and public speaker call by default" #6360

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

Merged
merged 1 commit into from
Aug 13, 2019
Merged

Revert "fix: Return only accepted session and public speaker call by default" #6360

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/api/sessions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def query(self, view_kwargs):
:param view_kwargs:
:return:
"""
query_ = self.session.query(Session).filter(Session.state == "accepted")
query_ = self.session.query(Session)
if view_kwargs.get('track_id') is not None:
track = safe_query(self, Track, 'id', view_kwargs['track_id'], 'track_id')
query_ = query_.join(Track).filter(Track.id == track.id)
Expand All @@ -104,7 +104,7 @@ def query(self, view_kwargs):
if view_kwargs.get('speaker_id'):
speaker = safe_query(self, Speaker, 'id', view_kwargs['speaker_id'], 'speaker_id')
# session-speaker :: many-to-many relationship
query_ = Session.query.filter(Session.speakers.any(id=speaker.id), Session.state == "accepted")
query_ = Session.query.filter(Session.speakers.any(id=speaker.id))

return query_

Expand Down
15 changes: 3 additions & 12 deletions app/api/speakers_calls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,29 +86,20 @@ def before_get_object(self, view_kwargs):
"""
if view_kwargs.get('event_identifier'):
try:
event = self.session.query(Event).filter_by(identifier=view_kwargs['event_identifier'],
privacy='public').one()
event = self.session.query(Event).filter_by(identifier=view_kwargs['event_identifier']).one()
except NoResultFound:
raise ObjectNotFound({'parameter': 'event_identifier'},
"Event: {} not found".format(view_kwargs['event_identifier']))
else:
view_kwargs['event_id'] = event.id

elif view_kwargs.get('event_id'):
if view_kwargs.get('event_id'):
try:
speakers_call = self.session.query(SpeakersCall).filter_by(event_id=view_kwargs['event_id'],
privacy='public').one()
speakers_call = self.session.query(SpeakersCall).filter_by(event_id=view_kwargs['event_id']).one()
except NoResultFound:
raise ObjectNotFound({'parameter': 'event_identifier'}, "Object: not found")
view_kwargs['id'] = speakers_call.id

else:
try:
speakers_call = self.session.query(SpeakersCall).filter_by(id=view_kwargs['id'], privacy='public').one()
except NoResultFound:
raise ObjectNotFound({'parameter': 'speaker_call_id'}, "Object: not found")
view_kwargs['id'] = speakers_call.id

decorators = (api.has_permission('is_coorganizer', fetch="event_id", fetch_as="event_id",
model=SpeakersCall, methods="PATCH,DELETE"),)
schema = SpeakersCallSchema
Expand Down