Skip to content

Commit 654cc60

Browse files
committed
Remove tipoligia_notizia taxonomy (from v3) and index v2 field and re-add criteria.
1 parent 97e87aa commit 654cc60

File tree

8 files changed

+46
-18
lines changed

8 files changed

+46
-18
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.DS_Store
12
.coverage
23
.coverage.*
34
.python-version

CHANGES.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ Changelog
55
1.0.4 (unreleased)
66
------------------
77

8-
- Nothing changed yet.
9-
8+
- Remove tipoligia_notizia taxonomy (from v3) and index v2 field.
9+
[cekk]
10+
- Re-add tipologia_notizia criteria.
11+
[cekk]
1012

1113
1.0.3 (2024-06-24)
1214
------------------

src/design/plone/ctgeneric/configure.zcml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<include package=".behaviors" />
2020
<include package=".browser" />
2121
<include package=".restapi" />
22+
<include package=".upgrades" />
2223
<include package=".vocabularies" />
2324

2425
<include file="monkey.zcml" />
@@ -48,10 +49,6 @@
4849
/>
4950

5051
<!-- indexers -->
51-
<adapter
52-
factory=".indexers.ruolo"
53-
name="ruolo"
54-
/>
55-
52+
<adapter factory=".indexers.ruolo" name="ruolo"/>
5653

5754
</configure>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?xml version="1.0"?>
22
<object name="portal_catalog">
3+
4+
<column value="tipologia_notizia"/><index name="tipologia_notizia" meta_type="FieldIndex">
5+
<indexed_attr value="tipologia_notizia"/>
6+
</index>
7+
38
<column value="ruolo"/>
49
</object>

src/design/plone/ctgeneric/profiles/default/metadata.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version='1.0' encoding='UTF-8'?>
22
<metadata>
3-
<version>1000</version>
3+
<version>1001</version>
44
<dependencies>
55
<!-- <dependency>profile-design.plone.contenttypes:default</dependency> -->
66
</dependencies>

src/design/plone/ctgeneric/profiles/default/registry/criteria.xml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,20 @@
2424
>Metadata</value>
2525
</records>
2626

27+
<!-- redefine tipologia_notizia criteria to not use taxonomy -->
28+
<records interface="plone.app.querystring.interfaces.IQueryField" prefix="plone.app.querystring.field.tipologia_notizia">
29+
<value key="title" i18n:translate="">Tipologia notizia</value>
30+
<value key="description" i18n:translate="">Tipologia della notizia</value>
31+
<value key="enabled">True</value>
32+
<value key="sortable">False</value>
33+
<value key="operations">
34+
<element>plone.app.querystring.operation.selection.any</element>
35+
<element>plone.app.querystring.operation.selection.all</element>
36+
</value>
37+
<value key="vocabulary">design.plone.vocabularies.tipologie_notizia</value>
38+
<value key="group" i18n:translate="">Metadata</value>
39+
</records>
40+
2741
<!-- remove from V3 -->
2842
<records interface="plone.app.querystring.interfaces.IQueryField" prefix="plone.app.querystring.field.business_events" remove="True" />
2943
<records interface="plone.app.querystring.interfaces.IQueryField" prefix="plone.app.querystring.field.person_life_events" remove="True" />
@@ -35,7 +49,6 @@
3549
<records interface="plone.app.querystring.interfaces.IQueryField" prefix="plone.app.querystring.field.tipologia_incarico" remove="True" />
3650
<records interface="plone.app.querystring.interfaces.IQueryField" prefix="plone.app.querystring.field.tipologia_licenze" remove="True" />
3751
<records interface="plone.app.querystring.interfaces.IQueryField" prefix="plone.app.querystring.field.tipologia_luogo" remove="True" />
38-
<records interface="plone.app.querystring.interfaces.IQueryField" prefix="plone.app.querystring.field.tipologia_notizia" remove="True" />
3952
<records interface="plone.app.querystring.interfaces.IQueryField" prefix="plone.app.querystring.field.tipologia_organizzazione" remove="True" />
4053
<records interface="plone.app.querystring.interfaces.IQueryField" prefix="plone.app.querystring.field.tipologia_pdc" remove="True" />
4154
<records interface="plone.app.querystring.interfaces.IQueryField" prefix="plone.app.querystring.field.tipologia_stati_pratica" remove="True" />

src/design/plone/ctgeneric/setuphandlers.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
from Products.CMFPlone.interfaces import ISearchSchema
55
from zope.component import getUtility
66
from zope.interface import implementer
7+
from plone import api
8+
from collective.taxonomy.interfaces import ITaxonomy
9+
from zope.i18n.interfaces import ITranslationDomain
10+
from zope.schema.interfaces import IVocabularyFactory
711

812

913
@implementer(INonInstallable)
@@ -23,6 +27,7 @@ def post_install(context):
2327
"""Post install script"""
2428
# Do something at the end of the installation of this package.
2529
disable_searchable_types()
30+
delete_tipologia_notizia_taxonomy()
2631

2732

2833
def uninstall(context):
@@ -44,3 +49,16 @@ def disable_searchable_types():
4449
]
4550
types = [x for x in settings.types_not_searched if x not in remove_types]
4651
settings.types_not_searched = tuple(types)
52+
53+
54+
def delete_tipologia_notizia_taxonomy():
55+
portal = api.portal.get()
56+
sm = portal.getSiteManager()
57+
name = "collective.taxonomy.tipologia_notizia"
58+
utility = sm.queryUtility(ITaxonomy, name=name)
59+
if utility is None:
60+
return
61+
utility.unregisterBehavior()
62+
sm.unregisterUtility(utility, ITaxonomy, name=name)
63+
sm.unregisterUtility(utility, IVocabularyFactory, name=name)
64+
sm.unregisterUtility(utility, ITranslationDomain, name=name)

test_plone60.cfg

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ collective.address = 1.6
4141
# redturtle.volto==5.0.1
4242
collective.purgebyid = 1.2.1
4343

44-
# Required by:
45-
# eea.api.taxonomy==1.5
46-
collective.taxonomy = 3.0.1
47-
4844
# Required by:
4945
# redturtle.bandi==1.4.3
5046
collective.tiles.collection = 2.0.0
@@ -65,10 +61,6 @@ collective.z3cform.datagridfield = 3.0.1
6561
# zest.releaser==8.0.0
6662
colorama = 0.4.6
6763

68-
# Required by:
69-
# design.plone.contenttypes==6.0.17.dev0
70-
eea.api.taxonomy = 1.5
71-
7264
# Required by:
7365
# openpyxl==3.1.2
7466
et-xmlfile = 1.1.0

0 commit comments

Comments
 (0)