Skip to content

Update Person schema #230

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

Merged
davisagli merged 4 commits into from
Sep 12, 2025
Merged

Update Person schema #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8bcb808
Update Person schema
davisagli Sep 10, 2025
8145ed6
update test
davisagli Sep 10, 2025
3738768
Make location cypress test more robust
davisagli Sep 10, 2025
0778ce9
Upgrade to kitconcept-core 1.0.0a24
davisagli Sep 12, 2025
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
1 change: 1 addition & 0 deletions backend/news/+personschema.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Adjust Person schema. @davisagli
8 changes: 4 additions & 4 deletions backend/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ classifiers = [
"Programming Language :: Python :: 3.12",
]
dependencies = [
"kitconcept.core==1.0.0a23",
"kitconcept.core==1.0.0a24",
"plone.api",
"plone.distribution",
"plone.restapi",
Expand All @@ -36,7 +36,7 @@ dependencies = [
"pas.plugins.keycloakgroups==1.0.0b1",
"pas.plugins.oidc==2.0.0",
"kitconcept.solr==2.0.0a1",
"collective.person==1.0.0b1",
"collective.person==1.0.0b2",
]

[dependency-groups]
Expand Down Expand Up @@ -233,7 +233,7 @@ constraint-dependencies = [
"cmarkgfm==2024.11.20",
"collective.MockMailHost==3.0.0",
"collective.monkeypatcher==2.0.0",
"collective.person==1.0.0b1",
"collective.person==1.0.0b2",
"collective.recipe.omelette==2.0.0",
"collective.recipe.template==2.2",
"collective.recipe.vscode==0.1.9",
Expand Down Expand Up @@ -289,7 +289,7 @@ constraint-dependencies = [
"jsonschema-specifications==2025.4.1",
"jsonschema==4.24.0",
"keyring==25.6.0",
"kitconcept.core==1.0.0a23",
"kitconcept.core==1.0.0a24",
"kitconcept.solr==2.0.0a1",
"kitconcept.voltolighttheme==7.0.0a28",
"legacy-cgi==2.6.2",
Expand Down
1 change: 0 additions & 1 deletion backend/src/kitconcept/intranet/behaviors/configure.zcml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
title="Intranet-specific Person fields"
description="Add the intranet-specific person fields"
provides=".person.IPersonBehavior"
for="collective.person.content.person.IPerson"

@ericof ericof Sep 11, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Do we plan to use this behavior on anything other than a Person? If not, I do not see a reason to remove this.

@davisagli davisagli Sep 11, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I removed it because there was a warning saying it doesn't do anything for a behavior that doesn't have a factory.

/>

</configure>
6 changes: 3 additions & 3 deletions backend/src/kitconcept/intranet/behaviors/person.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from kitconcept.intranet import _
from plone.autoform.interfaces import IFormFieldProvider
from plone.autoform.directives import order_before
from plone.supermodel import model
from zope import schema
from zope.interface import provider
Expand All @@ -9,6 +10,7 @@
class IPersonBehavior(model.Schema):
"""Behavior: Additional fields for a Person."""

order_before(academic_title="first_name")
academic_title = schema.Choice(
title=_("Academic Title"),
vocabulary="kitconcept.intranet.vocabularies.academic_titles",
Expand All @@ -17,12 +19,10 @@ class IPersonBehavior(model.Schema):

job_title = schema.TextLine(
title=_("Job Title"),
description=_("Please input the job title of the person."),
required=False,
)

departament = schema.TextLine(
department = schema.TextLine(
title=_("Department"),
description=_("Please input the department of the person."),
required=False,
)
18 changes: 5 additions & 13 deletions backend/src/kitconcept/intranet/locales/de/LC_MESSAGES/kitconcept.intranet.po
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2025-09-09 16:49+0000\n"
"POT-Creation-Date: 2025-09-10 19:48+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -34,11 +34,11 @@ msgstr ""
msgid "A Plone distribution for Intranets with Plone. Created by kitconcept."
msgstr "Eine Plone-Distribution für Intranets mit Plone. Erstellt von kitconcept."

#: kitconcept/intranet/behaviors/person.py:14
#: kitconcept/intranet/behaviors/person.py:15
msgid "Academic Title"
msgstr "Akademischer Titel"

#: kitconcept/intranet/behaviors/configure.zcml:48
#: kitconcept/intranet/behaviors/configure.zcml:47
msgid "Add the intranet-specific person fields"
msgstr "Fügen Sie die intranet-spezifischen Personenfelder hinzu"

Expand Down Expand Up @@ -109,11 +109,11 @@ msgstr "Intranet-beschränkter Workflow"
msgid "Intranet Settings"
msgstr "Intranet-Einstellungen"

#: kitconcept/intranet/behaviors/configure.zcml:48
#: kitconcept/intranet/behaviors/configure.zcml:47
msgid "Intranet-specific Person fields"
msgstr "Intranet-spezifische Personenfelder"

#: kitconcept/intranet/behaviors/person.py:20
#: kitconcept/intranet/behaviors/person.py:21
msgid "Job Title"
msgstr "Berufsbezeichnung"

Expand Down Expand Up @@ -156,14 +156,6 @@ msgstr ""
msgid "Placeholder text for the search field."
msgstr "Platzhaltertext für das Suchfeld."

#: kitconcept/intranet/behaviors/person.py:27
msgid "Please input the department of the person."
msgstr "Bitte geben Sie die Abteilung der Person an."

#: kitconcept/intranet/behaviors/person.py:21
msgid "Please input the job title of the person."
msgstr "Bitte geben Sie die Berufsbezeichnung der Person an."

#: kitconcept/intranet/profiles.zcml:14
msgid "Policy package to install our site"
msgstr "Paket mit Richtlinien zur Installation unserer Website"
Expand Down
18 changes: 5 additions & 13 deletions backend/src/kitconcept/intranet/locales/en/LC_MESSAGES/kitconcept.intranet.po
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2025-09-09 16:49+0000\n"
"POT-Creation-Date: 2025-09-10 19:48+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -34,11 +34,11 @@ msgstr ""
msgid "A Plone distribution for Intranets with Plone. Created by kitconcept."
msgstr ""

#: kitconcept/intranet/behaviors/person.py:14
#: kitconcept/intranet/behaviors/person.py:15
msgid "Academic Title"
msgstr ""

#: kitconcept/intranet/behaviors/configure.zcml:48
#: kitconcept/intranet/behaviors/configure.zcml:47
msgid "Add the intranet-specific person fields"
msgstr ""

Expand Down Expand Up @@ -109,11 +109,11 @@ msgstr ""
msgid "Intranet Settings"
msgstr ""

#: kitconcept/intranet/behaviors/configure.zcml:48
#: kitconcept/intranet/behaviors/configure.zcml:47
msgid "Intranet-specific Person fields"
msgstr ""

#: kitconcept/intranet/behaviors/person.py:20
#: kitconcept/intranet/behaviors/person.py:21
msgid "Job Title"
msgstr ""

Expand Down Expand Up @@ -156,14 +156,6 @@ msgstr ""
msgid "Placeholder text for the search field."
msgstr ""

#: kitconcept/intranet/behaviors/person.py:27
msgid "Please inform the department of the person."
msgstr ""

#: kitconcept/intranet/behaviors/person.py:21
msgid "Please inform the job title of the person."
msgstr ""

#: kitconcept/intranet/profiles.zcml:14
msgid "Policy package to install our site"
msgstr ""
Expand Down
18 changes: 5 additions & 13 deletions backend/src/kitconcept/intranet/locales/kitconcept.intranet.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2025-09-09 16:49+0000\n"
"POT-Creation-Date: 2025-09-10 19:48+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -37,11 +37,11 @@ msgstr ""
msgid "A Plone distribution for Intranets with Plone. Created by kitconcept."
msgstr ""

#: kitconcept/intranet/behaviors/person.py:14
#: kitconcept/intranet/behaviors/person.py:15
msgid "Academic Title"
msgstr ""

#: kitconcept/intranet/behaviors/configure.zcml:48
#: kitconcept/intranet/behaviors/configure.zcml:47
msgid "Add the intranet-specific person fields"
msgstr ""

Expand Down Expand Up @@ -112,11 +112,11 @@ msgstr ""
msgid "Intranet Settings"
msgstr ""

#: kitconcept/intranet/behaviors/configure.zcml:48
#: kitconcept/intranet/behaviors/configure.zcml:47
msgid "Intranet-specific Person fields"
msgstr ""

#: kitconcept/intranet/behaviors/person.py:20
#: kitconcept/intranet/behaviors/person.py:21
msgid "Job Title"
msgstr ""

Expand Down Expand Up @@ -159,14 +159,6 @@ msgstr ""
msgid "Placeholder text for the search field."
msgstr ""

#: kitconcept/intranet/behaviors/person.py:27
msgid "Please inform the department of the person."
msgstr ""

#: kitconcept/intranet/behaviors/person.py:21
msgid "Please inform the job title of the person."
msgstr ""

#: kitconcept/intranet/profiles.zcml:14
msgid "Policy package to install our site"
msgstr ""
Expand Down
18 changes: 5 additions & 13 deletions backend/src/kitconcept/intranet/locales/pt_BR/LC_MESSAGES/kitconcept.intranet.po
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2025-09-09 16:49+0000\n"
"POT-Creation-Date: 2025-09-10 19:48+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -34,11 +34,11 @@ msgstr ""
msgid "A Plone distribution for Intranets with Plone. Created by kitconcept."
msgstr "Uma distribuição Plone para Intranets com Plone. Criada pela kitconcept."

#: kitconcept/intranet/behaviors/person.py:14
#: kitconcept/intranet/behaviors/person.py:15
msgid "Academic Title"
msgstr ""

#: kitconcept/intranet/behaviors/configure.zcml:48
#: kitconcept/intranet/behaviors/configure.zcml:47
msgid "Add the intranet-specific person fields"
msgstr ""

Expand Down Expand Up @@ -109,11 +109,11 @@ msgstr "Workflow restrito para Intranet"
msgid "Intranet Settings"
msgstr "Configurações da Intranet"

#: kitconcept/intranet/behaviors/configure.zcml:48
#: kitconcept/intranet/behaviors/configure.zcml:47
msgid "Intranet-specific Person fields"
msgstr ""

#: kitconcept/intranet/behaviors/person.py:20
#: kitconcept/intranet/behaviors/person.py:21
msgid "Job Title"
msgstr ""

Expand Down Expand Up @@ -156,14 +156,6 @@ msgstr ""
msgid "Placeholder text for the search field."
msgstr "Texto de exemplo para o campo de busca."

#: kitconcept/intranet/behaviors/person.py:27
msgid "Please inform the department of the person."
msgstr ""

#: kitconcept/intranet/behaviors/person.py:21
msgid "Please inform the job title of the person."
msgstr ""

#: kitconcept/intranet/profiles.zcml:14
msgid "Policy package to install our site"
msgstr "Pacote de políticas para instalar nosso site"
Expand Down
26 changes: 13 additions & 13 deletions backend/uv.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion backend/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.0a23
1.0.0a24
6 changes: 5 additions & 1 deletion frontend/cypress/tests/main/content/location.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ describe('Add Content Tests', () => {
});
it('As editor I can add a location to Document content type and find it in listing block', function () {
cy.intercept('PATCH', '/**/my-page').as('save');

cy.intercept(
'GET',
'/**/@vocabularies/kitconcept.intranet.vocabularies.location_objects*',
).as('vocab');
cy.createContent({
contentType: 'Location',
contentId: 'headquarters-bonn-page',
Expand All @@ -41,6 +44,7 @@ describe('Add Content Tests', () => {
});
cy.navigate('/my-page/edit');
cy.wait('@schema');
cy.wait('@vocab');
cy.get('#field-location_reference').click();
cy.get(
'#field-location_reference .react-select__menu .react-select__option',
Expand Down
Loading