Skip to content

Commit

Permalink
Merge branch 'master' of github.com:nursix/eden
Browse files Browse the repository at this point in the history
  • Loading branch information
nursix committed Apr 19, 2021
2 parents cbf04ad + 5a447a4 commit 507f83a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions modules/s3/s3gis.py
Original file line number Diff line number Diff line change
Expand Up @@ -7953,7 +7953,7 @@ def addFeatureResources(feature_resources):
# Use gis/location controller in all reports
url_format = "%s/{id}.plain" % URL(c="gis", f="location")
else:
params.update({"components": "None",
params.update({"mcomponents": "None",
"maxdepth": maxdepth,
})
url = URL(c = row.controller,
Expand Down Expand Up @@ -8006,7 +8006,7 @@ def addFeatureResources(feature_resources):
# Not much we can do!
# @ToDo: Use Context
continue
options = "components=None&maxdepth=%s&show_ids=true" % maxdepth
options = "mcomponents=None&maxdepth=%s&show_ids=true" % maxdepth
if "?" in url:
url = "%s&%s" % (url, options)
else:
Expand Down Expand Up @@ -8484,7 +8484,7 @@ def as_dict(self):
maxdepth = 0
_url = URL(self.controller, self.function)
# id is used for url_format
url = "%s.geojson?layer=%i&components=None&maxdepth=%s&show_ids=true" % \
url = "%s.geojson?layer=%i&mcomponents=None&maxdepth=%s&show_ids=true" % \
(_url,
self.layer_id,
maxdepth)
Expand Down

0 comments on commit 507f83a

Please sign in to comment.