eea.coremetadata 4.1__zip → 4.3__zip

{eea.coremetadata-4.1/eea.coremetadata.egg-info → eea.coremetadata-4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eea.coremetadata
-Version: 4.1
+Version: 4.3
 Summary: An add-on for Plone
 Home-page: https://github.com/eea/eea.coremetadata
 Author: European Environment Agency: IDM2 A-Team
@@ -128,9 +128,19 @@ EEA_ - European Environment Agency (EU)
 Changelog
 =========
 
+4.3 - (2024-10-01)
+---------------------------
+* Change: Fix other organisations metadata
+  [avoinea]
+
+4.2 - (2024-07-29)
+---------------------------
+* Change: Cleanup code comments and pdb
+  [iugin]
+
 4.1 - (2024-07-25)
 ---------------------------
-* Change: Fix: Latest eea.coremetadata release has issues - refs #273093
+* Fix: Latest eea.coremetadata release has issues - refs #273093
   [avoinea]
 
 4.0 - (2024-06-21)

{eea.coremetadata-4.1 → eea.coremetadata-4.3}/docs/HISTORY.txt

@@ -1,9 +1,19 @@
 Changelog
 =========
 
+4.3 - (2024-10-01)
+---------------------------
+* Change: Fix other organisations metadata
+  [avoinea]
+
+4.2 - (2024-07-29)
+---------------------------
+* Change: Cleanup code comments and pdb
+  [iugin]
+
 4.1 - (2024-07-25)
 ---------------------------
-* Change: Fix: Latest eea.coremetadata release has issues - refs #273093
+* Fix: Latest eea.coremetadata release has issues - refs #273093
   [avoinea]
 
 4.0 - (2024-06-21)

{eea.coremetadata-4.1 → eea.coremetadata-4.3}/eea/coremetadata/behaviors/vocabulary.py

@@ -43,54 +43,15 @@ def eea_other_organisations(context):
 def organisations_vocabulary(context):
     """organisations_vocabulary"""
 
-    # import pdb
-    # pdb.set_trace()
     return eea_other_organisations(context)
-    # vocabulary = get_vocabulary(
-    #     context, "collective.taxonomy.eeaorganisationstaxonomy"
-    # )
-
-    # terms = [
-    #     SimpleTerm(key, key, val.encode("ascii", "ignore").decode("ascii"))
-    #     for val, key in vocabulary
-    # ]
-    # # import pdb
-    # # pdb.set_trace()
-    # terms.sort(key=lambda t: t.title)
-
-    # return SimpleVocabulary(terms)
 
 
 @provider(IVocabularyFactory)
 def index_organisations_vocabulary(context):
     """index_organisations_vocabulary"""
 
-    # import pdb
-    # pdb.set_trace()
     return eea_other_organisations(context)
 
-    # catalog_values = get_catalog_values(
-    #     context, "taxonomy_eeaorganisationstaxonomy"
-    # )
-    # vocabulary = get_vocabulary(
-    #     context, "collective.taxonomy.eeaorganisationstaxonomy"
-    # )
-    # terms = []
-
-    # # import pdb
-    # # pdb.set_trace()
-    # for val, key in vocabulary:
-    #     if key in catalog_values:
-    #         terms.append(
-    #             SimpleTerm(
-    #                 key, key, val.encode("ascii", "ignore").decode("ascii")
-    #             )
-    #         )
-
-    # terms.sort(key=lambda t: t.title)
-
-    # return SimpleVocabulary(terms)
-
 
 @provider(IVocabularyFactory)
 def publisher_vocabulary(context):

eea.coremetadata-4.3/eea/coremetadata/configure.zcml

@@ -0,0 +1,19 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
+    xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
+    xmlns:five="http://namespaces.zope.org/five"
+    xmlns:i18n="http://namespaces.zope.org/i18n" i18n_domain="eea">
+
+    <i18n:registerTranslations directory="locales" />
+
+    <include file="profiles.zcml" />
+    <include package=".browser" />
+    <include package=".behaviors" />
+    <include package=".upgrades" />
+
+    <adapter factory=".indexer.temporal_coverage_indexer" name="temporal_coverage" />
+    <adapter factory=".indexer.data_provenance_indexer" name="data_provenance" />
+
+    <utility name="eea.coremetadata.other_organisations" component=".vocabulary.OtherOrganisationsVocabularyFactory" />
+    <!-- <utility factory=".index_modifiers.OtherOrganisations" provides="plone.app.querystring.interfaces.IParsedQueryIndexModifier" name="taxonomy_eeaorganisationstaxonomy" /> -->
+</configure>

{eea.coremetadata-4.1 → eea.coremetadata-4.3}/eea/coremetadata/metadata.py

@@ -35,12 +35,6 @@ except ImportError:
     from z3c.form.browser.select import SelectFieldWidget
     from Products.CMFCore.permissions import ModifyPortalContent, View
 
-has_ajax_widget = True
-AjaxSelectFieldWidget = None
-try:
-    from plone.app.z3cform.widgets.select import AjaxSelectFieldWidget
-except ImportError:
-    has_ajax_widget = False
 
 _marker = []
 _zone = DateTime().timezone()
@@ -180,7 +174,9 @@ class ICoreMetadata(model.Schema):
     directives.no_omit(IEditForm, "effective", "expires")
     directives.no_omit(IAddForm, "effective", "expires")
 
-    directives.widget("other_organisations", SelectFieldWidget)
+    directives.widget("other_organisations",
+                      vocabulary="eea.coremetadata.other_organisations")
+
     other_organisations = Tuple(
         title=_("Other organisations involved"),
         description=_(
@@ -192,14 +188,6 @@ class ICoreMetadata(model.Schema):
         missing_value=(),
         default=tuple()
     )
-
-    if has_ajax_widget:
-        directives.widget(
-            "other_organisations",
-            AjaxSelectFieldWidget,
-            vocabulary="eea.coremetadata.other_organisations"
-        )
-
     directives.widget("topics", SelectFieldWidget)
     topics = Tuple(
         title=_("Topics"),

{eea.coremetadata-4.1 → eea.coremetadata-4.3}/eea/coremetadata/profiles/default/catalog.xml

@@ -21,7 +21,7 @@
         <indexed_attr value="data_provenance"/>
     </index>
 
-    <column value="taxonomy_eeaorganisationstaxonomy" />
+    <column value="other_organisations" />
     <column value="taxonomy_eeapublishertaxonomy" />
     <column value="taxonomy_eeatopicstaxonomy" />
     <column value="temporal_coverage" />

{eea.coremetadata-4.1 → eea.coremetadata-4.3}/eea/coremetadata/upgrades/configure.zcml

@@ -96,4 +96,13 @@
     profile="eea.coremetadata:default"
     />
 
+  <genericsetup:upgradeStep
+    title="Remove EEA Coremetadata Organisations taxonomy behavior and indexer"
+    description=""
+    source="4.0"
+    destination="5.0"
+    handler=".to_50.to_50"
+    profile="eea.coremetadata:default"
+    />
+
 </configure>

eea.coremetadata-4.3/eea/coremetadata/upgrades/to_50.py

@@ -0,0 +1,24 @@
+
+""" Upgrade to 5.0 """
+from zope.configuration.name import resolve
+
+
+def to_50(context):
+    """ Remove EEA Coremetadata Organisations taxonomy behavior and indexer """
+    sm = context.aq_parent.getSiteManager()
+
+    # Remove Adapter other_organisations indexer
+    required = [resolve('plone.dexterity.interfaces.IDexterityContent'),
+                resolve('Products.ZCatalog.interfaces.IZCatalog')]
+    provided = resolve('plone.indexer.interfaces.IIndexer')
+    name = 'other_organisations'
+    sm.adapters.unregister(required=required, provided=provided, name=name)
+
+    # Remove Utility other_organisations behavior
+    provided = resolve('plone.behavior.interfaces.IBehavior')
+    name = 'other_organisations'
+    ofs_id = 'plone.behavior.interfaces.IBehavior-other_organisations'
+    if ofs_id in sm.objectIds():
+        sm._delObject(ofs_id, suppress_events=True)
+
+    sm.unregisterUtility(provided=provided, name=name)

eea.coremetadata-4.3/eea/coremetadata/version.txt

@@ -0,0 +1 @@
+4.3

{eea.coremetadata-4.1 → eea.coremetadata-4.3/eea.coremetadata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eea.coremetadata
-Version: 4.1
+Version: 4.3
 Summary: An add-on for Plone
 Home-page: https://github.com/eea/eea.coremetadata
 Author: European Environment Agency: IDM2 A-Team
@@ -128,9 +128,19 @@ EEA_ - European Environment Agency (EU)
 Changelog
 =========
 
+4.3 - (2024-10-01)
+---------------------------
+* Change: Fix other organisations metadata
+  [avoinea]
+
+4.2 - (2024-07-29)
+---------------------------
+* Change: Cleanup code comments and pdb
+  [iugin]
+
 4.1 - (2024-07-25)
 ---------------------------
-* Change: Fix: Latest eea.coremetadata release has issues - refs #273093
+* Fix: Latest eea.coremetadata release has issues - refs #273093
   [avoinea]
 
 4.0 - (2024-06-21)

{eea.coremetadata-4.1 → eea.coremetadata-4.3}/eea.coremetadata.egg-info/SOURCES.txt

@@ -178,4 +178,5 @@ eea/coremetadata/upgrades/configure.zcml
 eea/coremetadata/upgrades/to_20.py
 eea/coremetadata/upgrades/to_24.py
 eea/coremetadata/upgrades/to_36.py
-eea/coremetadata/upgrades/to_40.py
+eea/coremetadata/upgrades/to_40.py
+eea/coremetadata/upgrades/to_50.py

eea.coremetadata-4.1/eea/coremetadata/configure.zcml

@@ -1,28 +0,0 @@
-<configure
-  xmlns="http://namespaces.zope.org/zope"
-  xmlns:zcml="http://namespaces.zope.org/zcml"
-  xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
-  xmlns:five="http://namespaces.zope.org/five"
-  xmlns:i18n="http://namespaces.zope.org/i18n"
-  i18n_domain="eea">
-
-  <i18n:registerTranslations directory="locales" />
-
-  <include file="profiles.zcml" />
-  <include package=".browser" />
-  <include package=".behaviors" />
-  <include package=".upgrades" />
-
-  <adapter factory=".indexer.temporal_coverage_indexer" name="temporal_coverage" />
-  <adapter factory=".indexer.data_provenance_indexer" name="data_provenance" />
-
-  <utility
-      name="eea.coremetadata.other_organisations"
-      component=".vocabulary.OtherOrganisationsVocabularyFactory"
-      />
-  <utility
-      factory=".index_modifiers.OtherOrganisations"
-      provides="plone.app.querystring.interfaces.IParsedQueryIndexModifier"
-      name="taxonomy_eeaorganisationstaxonomy"
-      />
-</configure>

eea.coremetadata-4.1/eea/coremetadata/version.txt

@@ -1 +0,0 @@
-4.1