Skip to content

Allow sfid to be None to work with older code #139

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
emiliom merged 1 commit into from
Jan 9, 2018
Merged

Allow sfid to be None to work with older code #139

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
3 changes: 2 additions & 1 deletion odm2api/ODM2/services/readService.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,8 @@ def getResults(self, ids=None, restype = None, uuids=None, actionid=None, simula
warnings.warn('The parameter \'sfid\' is deprecated. '
'Please use the sfids parameter instead and send in a list.',
DeprecationWarning, stacklevel=2)
query = query.join(FeatureActions).filter_by(SamplingFeatureID=kwargs['sfid'])
if kwargs['sfid']:
query = query.join(FeatureActions).filter_by(SamplingFeatureID=kwargs['sfid'])
if sfids or sfcodes or sfuuids:
sf_list = self.getSamplingFeatures(ids=sfids, codes=sfcodes, uuids=sfuuids)
sfids = []
Expand Down