Merge pull request #139 from lsetiawan/fix_gr

Allow sfid to be None to work with older code

Author: emiliom

odm2api/ODM2/services/readService.py

@@ -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 = []