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.

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

Merge core #42

Merged
merged 4 commits into from
Oct 24, 2023
Merged

Merge core #42

merged 4 commits into from
Oct 24, 2023

Conversation

mwallschlaeger
Copy link

merge final changes from upstream related to contact roles

etj and others added 4 commits October 23, 2023 12:00
Co-authored-by: mattiagiupponi <51856725+mattiagiupponi@users.noreply.github.com>
* Makes more clear the is_enable function in themes

* Update models.py

* Update 0015_alter_geonodethemecustomization_is_enabled.py

* fix format
…ith multiplicity (GeoNode#10367)

* issue#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* issue#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* issue#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* issue#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* fixed typo

* created a centralized enum with the roles. added contacts to geonode_metadata_full.html. refactored

* multiple poc are displayed in _resourcebase_info_panel

* Fixes GeoNode#10290 complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* Fixes GeoNode#10290 complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* Fixes GeoNode#10290 complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* Fixes GeoNode#10290 complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* Fixes GeoNode#10290 complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* Fixes GeoNode#10290 complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* Fixes GeoNode#10290 complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* Fixes GeoNode#10290 complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* Fixes GeoNode#10290 complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* Fixes GeoNode#10290 complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* Fixes GeoNode#10290 complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* Updates for PATCH for multiple contacts along with tests for each role.

* Fixes GeoNode#10290 complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* Fixes GeoNode#10290 complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* Fixed default contact roles for new resource and added tests

* black

* black

* Fixed AttributeError with TaggitProfileSelect2Custom

* Fixes GeoNode#10290 complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* issue#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* issue#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* issue#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* - Fix formatting

* issue#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* issue#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* issue#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* issue#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* issue#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* issue#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* issue#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* [Fixes GeoNode#10290] complete ISO contact roles per ressource base with multiplicity

* [Fixes GeoNode#10290] complete ISO contact roles per ressource base with multiplicity

* Revert "[Fixes GeoNode#10290] complete ISO contact roles per ressource base with multiplicity"

This reverts commit 44b294b.

* issue#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* issue#10290_complete_ISO_contact_roles_per_ressource_base_with_multiplicity

* revert unintended changes from recent commit

* revert unintended changes from recent commit

* revert unintended changes from recent commit

* revert unintended changes from recent commit

---------

Co-authored-by: Malte Iwanicki <malteiwa@gmail.com>
Co-authored-by: Malte Iwanicki <45853662+MalteIwanicki@users.noreply.github.com>
Co-authored-by: ahmdthr <ahmad.tahir@pixida.de>
Co-authored-by: Florian Hoedt <gannebamm@gmail.com>
Co-authored-by: Giovanni Allegri <giohappy@gmail.com>
Co-authored-by: Alessio Fabiani <alessio.fabiani@geosolutionsgroup.com>
Co-authored-by: Marcel Wallschlaeger <mwarcel.wallschlaeger@zalf.de>
@mwallschlaeger mwallschlaeger self-assigned this Oct 24, 2023
@mwallschlaeger mwallschlaeger merged commit 03e5ad2 into main Oct 24, 2023
@mwallschlaeger mwallschlaeger deleted the merge-core branch October 24, 2023 13:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants