Skip to content

Commit fbf3cc8

Browse files
mattiagiupponigiohappyridoomarlowp
authored
align 1.1.x with master (#297)
* [Fixes #273] connect resource with execution request * Update README.md * Update README.md * store spacial file always true for cloning * store spacial file always true for cloning * fix build * [Fixes #12763] 3D tiles geometricError mandatory field should be on t… (#279) * [Fixes #12763] 3D tiles geometricError mandatory field should be on tileset level ref to GeoNode/geonode#12763 * fix tests * Update tests.py * Update test_end2end.py * fix test * [Fixes #12789] Improve 3dtiles filename handling (#281) * Fix migrations for asset (#283) * Fix migrations for create handlerinfo via asset * Fix migrations for create handlerinfo via asset * [Fixes #286] Allow to add metadata when uploading a resource (#287) * [Fixes #12828] New remote datasets are not registered inside proxy allowed hosts when GeoNode runs asynchoronously (#282) * [Fixes #255] Fix encoding for Shapefile uploads (#289) Use SHAPE_ENCODING parameter to inform the ogr2ogr command of the encoding for the Shapefile so it can transform accordingly. * [FIXIES 13044] Remote WMS dataset store is not correct if uploaded via importer (#292) * Update remote.py * [FIXIES 13044] Remote WMS dataset store is not correct if uploaded via importer * [Fixes #13451] broken upload datasets when asset have duplicated name from different users (#296) --------- Co-authored-by: Giovanni Allegri <giovanni.allegri@gmail.com> Co-authored-by: Henning Bredel <881756+ridoo@users.noreply.github.com> Co-authored-by: Peter Marlow <12926104+marlowp@users.noreply.github.com>
1 parent 3681da7 commit fbf3cc8

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

importer/handlers/common/raster.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,7 @@ def import_resource(self, files: dict, execution_id: str, **kwargs) -> str:
271271
overwrite_existing_layer=should_be_overwritten,
272272
):
273273
workspace = DataPublisher(None).workspace
274-
user_datasets = Dataset.objects.filter(
275-
owner=_exec.user, alternate=f"{workspace.name}:{layer_name}"
276-
)
274+
user_datasets = Dataset.objects.filter(alternate=f"{workspace.name}:{layer_name}")
277275

278276
dataset_exists = user_datasets.exists()
279277

@@ -506,17 +504,17 @@ def _import_resource_rollback(self, exec_id, istance_name=None, *args, **kwargs)
506504
"""
507505
pass
508506

509-
def _publish_resource_rollback(self, exec_id, istance_name=None, *args, **kwargs):
507+
def _publish_resource_rollback(self, exec_id, instance_name=None, *args, **kwargs):
510508
"""
511509
We delete the resource from geoserver
512510
"""
513511
logger.info(
514-
f"Rollback publishing step in progress for execid: {exec_id} resource published was: {istance_name}"
512+
f"Rollback publishing step in progress for execid: {exec_id} resource published was: {instance_name}"
515513
)
516514
exec_object = orchestrator.get_execution_object(exec_id)
517515
handler_module_path = exec_object.input_params.get("handler_module_path")
518516
publisher = DataPublisher(handler_module_path=handler_module_path)
519-
publisher.delete_resource(istance_name)
517+
publisher.delete_resource(instance_name)
520518

521519

522520
@importer_app.task(

0 commit comments

Comments
 (0)