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

rc 1.4.8 #24

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion docs/HISTORY.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ Changelog
1.4.8 (unreleased)
------------------

- Nothing changed yet.
- Do not use key/value pairs in tipologia_bando and destinatari.
[cekk]

- Bandi querystring criteria to search by bandi state.
[folix-01]


1.4.7 (2024-12-12)
Expand Down
15 changes: 15 additions & 0 deletions redturtle/bandi/configure.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<include package=".content" />
<include package=".portlets" />
<include package=".restapi" />
<include package=".querystring" />
<include zcml:condition="installed collective.tiles.collection" package=".tiles" />
<include file="upgrades.zcml" />

Expand Down Expand Up @@ -58,6 +59,15 @@
description="RedTurtle Bandi migrate to version 1100"
provides="Products.GenericSetup.interfaces.EXTENSION"
/>

<genericsetup:registerProfile
name="to_2300"
title="Migrate to version 2300"
directory="profiles/to_2300"
description="RedTurtle Bandi migrate to version 2300"
provides="Products.GenericSetup.interfaces.EXTENSION"
/>

<!-- registro i vocabolari -->
<utility
name="redturtle.bandi.tipologia.vocabulary"
Expand All @@ -74,6 +84,11 @@
component=".vocabularies.EnteVocabulary"
/>

<utility
name="redturtle.bandi.vocabularies.bandi_states"
component=".vocabularies.BandiStatesVcabularyFactory"
/>

<!-- indexers -->
<adapter name="destinatari_bando" factory=".indexer.destinatari_bando" />
<adapter name="chiusura_procedimento_bando" factory=".indexer.chiusura_procedimento_bando" />
Expand Down
34 changes: 17 additions & 17 deletions redturtle/bandi/interfaces/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,47 +10,47 @@ class IBandoSettings(Interface):
"""

default_ente = schema.Tuple(
title=_(u"default_ente_label", default=u"Default Ente"),
title=_("default_ente_label", default="Default Ente"),
description=_(
u"default_ente_help",
default=u"Insert a list of default Enti that will be automatically selected when adding a new Bando.",
"default_ente_help",
default="Insert a list of default Enti that will be automatically selected when adding a new Bando.",
),
required=False,
value_type=schema.TextLine(),
missing_value=None,
default=(u"Regione Emilia-Romagna",),
default=("Regione Emilia-Romagna",),
)

default_destinatari = schema.Tuple(
title=_(u"default_destinatari_label", default=u"Destinatari types"),
title=_("default_destinatari_label", default="Destinatari types"),
description=_(
u"default_destinatari_help",
default=u"Insert a list of available destinatari that can be selected when adding a new Bando.",
"default_destinatari_help",
default="Insert a list of available destinatari that can be selected when adding a new Bando.",
),
required=False,
value_type=schema.TextLine(),
missing_value=None,
default=(
u"Cittadini|Cittadini",
u"Imprese|Imprese",
u"Enti locali|Enti locali",
u"Associazioni|Associazioni",
u"Altro|Altro",
"Cittadini",
"Imprese",
"Enti locali",
"Associazioni",
"Altro",
),
)

tipologie_bando = schema.Tuple(
title=_("tipologie_bando_label", default=u"Announcement types"),
title=_("tipologie_bando_label", default="Announcement types"),
description=_(
"tipologie_help",
u"These values will extend bandi.xml vocabulary on filesystem",
"These values will extend bandi.xml vocabulary on filesystem",
),
required=False,
value_type=schema.TextLine(),
missing_value=None,
default=(
u"beni_servizi|Acquisizione beni e servizi",
u"agevolazioni|Agevolazioni, finanziamenti, contributi",
u"altro|Altro",
"Acquisizione beni e servizi",
"Agevolazioni, finanziamenti, contributi",
"Altro",
),
)
Loading