Skip to content
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

Jump to bottom

Fixes #11578: align geoapp metadata update to other resources #11624

Merged
merged 6 commits into from
Oct 25, 2023
Merged

Fixes #11578: align geoapp metadata update to other resources #11624

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e8a64bc
Fixes #11578: align geoapp metadata update to other resources
mattiagiupponi Oct 19, 2023
1a53b0a
Fixes #11578: align geoapp metadata update to other resources
mattiagiupponi Oct 19, 2023
29da59a
Fixes #11578: align geoapp metadata update to other resources
mattiagiupponi Oct 19, 2023
2e2fe16
Fixes #11578: fix broken tests
mattiagiupponi Oct 23, 2023
476be05
merge with master
mattiagiupponi Oct 24, 2023
0020b4f
fix black format
mattiagiupponi Oct 24, 2023
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
31 changes: 19 additions & 12 deletions geonode/geoapps/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,21 +327,15 @@ def geoapp_metadata(
geoapp_form.cleaned_data.pop("linked_resources")

geoapp_obj = geoapp_form.instance
geoapp_obj.keywords.clear()
geoapp_obj.keywords.add(*new_keywords)
geoapp_obj.regions.clear()
geoapp_obj.regions.add(*new_regions)
geoapp_obj.category = new_category

_vals = dict(**geoapp_form.cleaned_data, **additional_vals)
_vals.update({"resource_type": resource_type, "sourcetype": SOURCE_TYPE_LOCAL})

resource_manager.update(
geoapp_obj.uuid,
instance=geoapp_obj,
keywords=new_keywords,
regions=new_regions,
vals=_vals,
notify=True,
extra_metadata=json.loads(extra_metadata),
)
resource_manager.set_thumbnail(geoapp_obj.uuid, instance=geoapp_obj, overwrite=False)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

resource update was performed 2 times for geoapps


register_event(request, EventType.EVENT_CHANGE_METADATA, geoapp_obj)
if not ajax:
return HttpResponseRedirect(hookset.geoapp_detail_url(geoapp_obj))
Expand Down Expand Up @@ -373,7 +367,20 @@ def geoapp_metadata(
if any([x in geoapp_form.changed_data for x in ["is_approved", "is_published"]]):
vals["is_approved"] = geoapp_form.cleaned_data.get("is_approved", geoapp_obj.is_approved)
vals["is_published"] = geoapp_form.cleaned_data.get("is_published", geoapp_obj.is_published)
resource_manager.update(geoapp_obj.uuid, instance=geoapp_obj, notify=True, vals=vals)
else:
vals.pop("is_approved", None)
vals.pop("is_published", None)

resource_manager.update(
geoapp_obj.uuid,
instance=geoapp_obj,
notify=True,
vals=vals,
extra_metadata=json.loads(extra_metadata),
)

resource_manager.set_thumbnail(geoapp_obj.uuid, instance=geoapp_obj, overwrite=False)

return HttpResponse(json.dumps({"message": message}))
elif request.method == "POST" and (
not geoapp_form.is_valid() or not category_form.is_valid() or not tkeywords_form.is_valid()
Expand Down
3 changes: 3 additions & 0 deletions geonode/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2361,3 +2361,6 @@ def get_geonode_catalogue_service():
DEFAULT_DATASET_DOWNLOAD_HANDLER = "geonode.layers.download_handler.DatasetDownloadHandler"

DATASET_DOWNLOAD_HANDLERS = ast.literal_eval(os.getenv("DATASET_DOWNLOAD_HANDLERS", "[]"))

DEFAULT_ANONYMOUS_VIEW_PERMISSION = False
DEFAULT_ANONYMOUS_DOWNLOAD_PERMISSION = False
Loading