From e2d8ca773818f99f588d5865bf13843c601fa90f Mon Sep 17 00:00:00 2001 From: Mattia Date: Tue, 22 Oct 2024 16:17:57 +0200 Subject: [PATCH] [Fixes #12674] store spatial file is always false during cloning --- .env_dev | 3 --- geonode/upload/handlers/common/raster.py | 2 +- geonode/upload/handlers/common/remote.py | 2 +- geonode/upload/handlers/common/vector.py | 4 ++-- geonode/upload/handlers/shapefile/handler.py | 2 +- geonode/upload/handlers/tiles3d/handler.py | 2 +- requirements.txt | 2 +- 7 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.env_dev b/.env_dev index 34f85b41da6..d37591416fc 100644 --- a/.env_dev +++ b/.env_dev @@ -166,9 +166,6 @@ DEBUG=True SECRET_KEY='myv-y4#7j-d*p-__@j#*3z@!y24fz8%^z2v6atuy4bo9vqr1_a' -# STATIC_ROOT=/mnt/volumes/statics/static/ -# MEDIA_ROOT=/mnt/volumes/statics/uploaded/ -# GEOIP_PATH=/mnt/volumes/statics/geoip.db CACHE_BUSTING_STATIC_ENABLED=False diff --git a/geonode/upload/handlers/common/raster.py b/geonode/upload/handlers/common/raster.py index 14dd5d40971..e581d739d1f 100644 --- a/geonode/upload/handlers/common/raster.py +++ b/geonode/upload/handlers/common/raster.py @@ -125,7 +125,7 @@ def extract_params_from_data(_data, action=None): """ if action == exa.COPY.value: title = json.loads(_data.get("defaults")) - return {"title": title.pop("title")}, _data + return {"title": title.pop("title"), "store_spatial_file": True}, _data return { "skip_existing_layers": _data.pop("skip_existing_layers", "False"), diff --git a/geonode/upload/handlers/common/remote.py b/geonode/upload/handlers/common/remote.py index 6cc827f0e15..f72579e2708 100755 --- a/geonode/upload/handlers/common/remote.py +++ b/geonode/upload/handlers/common/remote.py @@ -102,7 +102,7 @@ def extract_params_from_data(_data, action=None): """ if action == exa.COPY.value: title = json.loads(_data.get("defaults")) - return {"title": title.pop("title")}, _data + return {"title": title.pop("title"), "store_spatial_file": True}, _data return { "source": _data.pop("source", "upload"), diff --git a/geonode/upload/handlers/common/vector.py b/geonode/upload/handlers/common/vector.py index ddf755d55a1..3aa5a48040c 100644 --- a/geonode/upload/handlers/common/vector.py +++ b/geonode/upload/handlers/common/vector.py @@ -135,7 +135,7 @@ def extract_params_from_data(_data, action=None): """ if action == exa.COPY.value: title = json.loads(_data.get("defaults")) - return {"title": title.pop("title")}, _data + return {"title": title.pop("title"), "store_spatial_file": True}, _data return { "skip_existing_layers": _data.pop("skip_existing_layers", "False"), @@ -258,7 +258,7 @@ def perform_last_step(execution_id): that the execution is completed """ _exec = BaseHandler.perform_last_step(execution_id=execution_id) - if _exec and not _exec.input_params.get("store_spatial_file", False): + if _exec and not _exec.input_params.get("store_spatial_file", True): resources = ResourceHandlerInfo.objects.filter(execution_request=_exec) # getting all assets list assets = filter(None, [get_default_asset(x.resource) for x in resources]) diff --git a/geonode/upload/handlers/shapefile/handler.py b/geonode/upload/handlers/shapefile/handler.py index d93214a03bc..1f5951c32b8 100644 --- a/geonode/upload/handlers/shapefile/handler.py +++ b/geonode/upload/handlers/shapefile/handler.py @@ -103,7 +103,7 @@ def extract_params_from_data(_data, action=None): """ if action == exa.COPY.value: title = json.loads(_data.get("defaults")) - return {"title": title.pop("title")}, _data + return {"title": title.pop("title"), "store_spatial_file": True}, _data additional_params = { "skip_existing_layers": _data.pop("skip_existing_layers", "False"), diff --git a/geonode/upload/handlers/tiles3d/handler.py b/geonode/upload/handlers/tiles3d/handler.py index 9cb2db7e426..43cbe1ba498 100755 --- a/geonode/upload/handlers/tiles3d/handler.py +++ b/geonode/upload/handlers/tiles3d/handler.py @@ -146,7 +146,7 @@ def extract_params_from_data(_data, action=None): """ if action == exa.COPY.value: title = json.loads(_data.get("defaults")) - return {"title": title.pop("title")}, _data + return {"title": title.pop("title"), "store_spatial_file": True}, _data return { "skip_existing_layers": _data.pop("skip_existing_layers", "False"), diff --git a/requirements.txt b/requirements.txt index 0d8b8a9399c..8b57016983f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -87,7 +87,7 @@ geonode-pinax-notifications==6.0.0.2 # GeoNode org maintained apps. # django-geonode-mapstore-client==4.0.5 -git+https://github.com/GeoNode/geonode-mapstore-client.git@master#egg=django_geonode_mapstore_client +git+https://github.com/GeoNode/geonode-mapstore-client.git@ISSUE_12657#egg=django_geonode_mapstore_client django-avatar==8.0.0 geonode-oauth-toolkit==2.2.2.2 geonode-user-messages==2.0.2.2