diff --git a/backend/news/+personschema.bugfix b/backend/news/+personschema.bugfix new file mode 100644 index 000000000..30d3f0989 --- /dev/null +++ b/backend/news/+personschema.bugfix @@ -0,0 +1 @@ +Adjust Person schema. @davisagli diff --git a/backend/pyproject.toml b/backend/pyproject.toml index 9b0b42fb0..430a21ab5 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -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", @@ -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] @@ -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", @@ -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", diff --git a/backend/src/kitconcept/intranet/behaviors/configure.zcml b/backend/src/kitconcept/intranet/behaviors/configure.zcml index 56d298f80..2f1f26cac 100644 --- a/backend/src/kitconcept/intranet/behaviors/configure.zcml +++ b/backend/src/kitconcept/intranet/behaviors/configure.zcml @@ -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" /> diff --git a/backend/src/kitconcept/intranet/behaviors/person.py b/backend/src/kitconcept/intranet/behaviors/person.py index b895fcc3e..f2d7fb857 100644 --- a/backend/src/kitconcept/intranet/behaviors/person.py +++ b/backend/src/kitconcept/intranet/behaviors/person.py @@ -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 @@ -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", @@ -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, ) diff --git a/backend/src/kitconcept/intranet/locales/de/LC_MESSAGES/kitconcept.intranet.po b/backend/src/kitconcept/intranet/locales/de/LC_MESSAGES/kitconcept.intranet.po index 15216878b..7bae6e755 100644 --- a/backend/src/kitconcept/intranet/locales/de/LC_MESSAGES/kitconcept.intranet.po +++ b/backend/src/kitconcept/intranet/locales/de/LC_MESSAGES/kitconcept.intranet.po @@ -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 \n" "Language-Team: LANGUAGE \n" @@ -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" @@ -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" @@ -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" diff --git a/backend/src/kitconcept/intranet/locales/en/LC_MESSAGES/kitconcept.intranet.po b/backend/src/kitconcept/intranet/locales/en/LC_MESSAGES/kitconcept.intranet.po index 0442408d5..fa30716c8 100644 --- a/backend/src/kitconcept/intranet/locales/en/LC_MESSAGES/kitconcept.intranet.po +++ b/backend/src/kitconcept/intranet/locales/en/LC_MESSAGES/kitconcept.intranet.po @@ -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 \n" "Language-Team: LANGUAGE \n" @@ -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 "" @@ -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 "" @@ -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 "" diff --git a/backend/src/kitconcept/intranet/locales/kitconcept.intranet.pot b/backend/src/kitconcept/intranet/locales/kitconcept.intranet.pot index cfa83aeab..5eade9daf 100644 --- a/backend/src/kitconcept/intranet/locales/kitconcept.intranet.pot +++ b/backend/src/kitconcept/intranet/locales/kitconcept.intranet.pot @@ -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 \n" "Language-Team: LANGUAGE \n" @@ -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 "" @@ -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 "" @@ -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 "" diff --git a/backend/src/kitconcept/intranet/locales/pt_BR/LC_MESSAGES/kitconcept.intranet.po b/backend/src/kitconcept/intranet/locales/pt_BR/LC_MESSAGES/kitconcept.intranet.po index 7f966b248..533488b60 100644 --- a/backend/src/kitconcept/intranet/locales/pt_BR/LC_MESSAGES/kitconcept.intranet.po +++ b/backend/src/kitconcept/intranet/locales/pt_BR/LC_MESSAGES/kitconcept.intranet.po @@ -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 \n" "Language-Team: LANGUAGE \n" @@ -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 "" @@ -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 "" @@ -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" diff --git a/backend/uv.lock b/backend/uv.lock index a993429b4..36bb0c97a 100644 --- a/backend/uv.lock +++ b/backend/uv.lock @@ -36,7 +36,7 @@ constraints = [ { name = "cmarkgfm", specifier = "==2024.11.20" }, { name = "collective-mockmailhost", specifier = "==3.0.0" }, { name = "collective-monkeypatcher", specifier = "==2.0.0" }, - { name = "collective-person", specifier = "==1.0.0b1" }, + { name = "collective-person", specifier = "==1.0.0b2" }, { name = "collective-recipe-omelette", specifier = "==2.0.0" }, { name = "collective-recipe-template", specifier = "==2.2" }, { name = "collective-recipe-vscode", specifier = "==0.1.9" }, @@ -91,7 +91,7 @@ constraints = [ { name = "jsonschema", specifier = "==4.24.0" }, { name = "jsonschema-specifications", specifier = "==2025.4.1" }, { name = "keyring", specifier = "==25.6.0" }, - { name = "kitconcept-core", specifier = "==1.0.0a23" }, + { name = "kitconcept-core", specifier = "==1.0.0a24" }, { name = "kitconcept-solr", specifier = "==2.0.0a1" }, { name = "kitconcept-voltolighttheme", specifier = "==7.0.0a28" }, { name = "legacy-cgi", specifier = "==2.6.2" }, @@ -701,7 +701,7 @@ wheels = [ [[package]] name = "collective-contact-behaviors" -version = "1.0.0b3" +version = "1.0.0b4" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "plone-api" }, @@ -709,9 +709,9 @@ dependencies = [ { name = "products-cmfplone" }, { name = "pycountry" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/08/32/9236aab8e32c1183b3b71942ab5c3834746857366cea39b7110a181ac1e0/collective_contact_behaviors-1.0.0b3.tar.gz", hash = "sha256:419c33eb82e8b8b169dfc20669120bd2b0440841f1fd30b8f9781bc3f3b30d9f", size = 74785, upload-time = "2025-09-08T14:53:25.767Z" } +sdist = { url = "https://files.pythonhosted.org/packages/9b/81/cac7f302c2a0da4d4065436413f41f46289a1ce3e92f8147d2a141078390/collective_contact_behaviors-1.0.0b4.tar.gz", hash = "sha256:0d38d4a9d0072a5f3d82f7848f9c6973c6155331f065133fa27bdf7f42f80230", size = 74915, upload-time = "2025-09-11T08:40:18.986Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/b0/8b/49d3044e69cd10824966d55aef74bdc6c6e0e1bc540f3d21f67c4fbcc3ac/collective_contact_behaviors-1.0.0b3-py3-none-any.whl", hash = "sha256:b5fe16c98149d3c1fd9db0c70e927c9a47177f4fcf04f22bd4f5a1ff20ae9f9c", size = 82468, upload-time = "2025-09-08T14:53:24.696Z" }, + { url = "https://files.pythonhosted.org/packages/b6/44/c52e8876a2768a04d6b8b6aff96dd155ed80b09f3ed614ee4509ee15e12b/collective_contact_behaviors-1.0.0b4-py3-none-any.whl", hash = "sha256:e3ea8dbeb950e1e1d89dc15841ebf75407758f8b84b44ea1f767cf385e235d7b", size = 82582, upload-time = "2025-09-11T08:40:17.906Z" }, ] [[package]] @@ -760,7 +760,7 @@ wheels = [ [[package]] name = "collective-person" -version = "1.0.0b1" +version = "1.0.0b2" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "collective-contact-behaviors" }, @@ -770,9 +770,9 @@ dependencies = [ { name = "plone-volto" }, { name = "products-cmfplone" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/5d/9f/835bca54cab30e86ab9910b2acf069d883ebbd391674e0acc85b7fe192f9/collective_person-1.0.0b1.tar.gz", hash = "sha256:f9da3eaf106672e8fedc5c12b26459d80f8bef9c8508bbadcbdb70f4522a1f5d", size = 1423317, upload-time = "2025-09-09T15:32:19.793Z" } +sdist = { url = "https://files.pythonhosted.org/packages/5b/82/4cd195fefeeb1271fb615dd388f72bdbc39694e85c67175fd796265793c0/collective_person-1.0.0b2.tar.gz", hash = "sha256:272310fc9db796ba1533fec2273b711fe744b5cb656810ab68f217cd1788bf5a", size = 1423573, upload-time = "2025-09-11T08:59:01.051Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/93/c9/af1b469e2f79c4d54139f4fa6066d2b3496a46dc2cc2d8bacb24eee47411/collective_person-1.0.0b1-py3-none-any.whl", hash = "sha256:7956dd575a20d5e83ccc58d9733fa48f49f49693062bbd0afdb085d044b56173", size = 1439552, upload-time = "2025-09-09T15:32:16.452Z" }, + { url = "https://files.pythonhosted.org/packages/28/52/317d74094e67cf609143032f663edb5f3a0662f5a3cfbe165351f5894e47/collective_person-1.0.0b2-py3-none-any.whl", hash = "sha256:6a08dd2d855f82a7cbb3660ecf4c6d40b46dcf4418042f48724d43a470ed03cf", size = 1440577, upload-time = "2025-09-11T08:58:58.483Z" }, ] [[package]] @@ -1297,7 +1297,7 @@ wheels = [ [[package]] name = "kitconcept-core" -version = "1.0.0a23" +version = "1.0.0a24" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "collective-honeypot" }, @@ -1311,9 +1311,9 @@ dependencies = [ { name = "plonegovbr-socialmedia" }, { name = "products-cmfplone" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/c2/dc/e3ad4e05bb66f0d1142be3b371d784c383ba19e7dcd33910a1d237eda046/kitconcept_core-1.0.0a23.tar.gz", hash = "sha256:d43eb38132608bd0e5c445c155f204629b5b4caf817977be1b05e62881ed2388", size = 315983, upload-time = "2025-09-08T14:50:52.765Z" } +sdist = { url = "https://files.pythonhosted.org/packages/cb/f2/5e38ce5ba221cd6527f39d110e1ac58f08dac382347c05f1d29dfea30ef8/kitconcept_core-1.0.0a24.tar.gz", hash = "sha256:968019674b51f150dde8555e7b461aeb9af264b36078af5eb5b784e713518647", size = 315487, upload-time = "2025-09-12T15:05:03.253Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/88/4a/7bd0264a0f9ef132604173e56c8486f3a0af0c2951ebc0e81e6719da8f75/kitconcept_core-1.0.0a23-py3-none-any.whl", hash = "sha256:cd0d7ed3a86ec4bbe0cb9ff0ae91716985cd5685c01314fa27294771c21bf4dd", size = 233510, upload-time = "2025-09-08T14:50:51.123Z" }, + { url = "https://files.pythonhosted.org/packages/76/ef/114c437b5cd4f005c85c705ddc38350ffae3840886e8e351875ff523037d/kitconcept_core-1.0.0a24-py3-none-any.whl", hash = "sha256:786ec80594365a044de25de3d90689726f267370a1e6ecb75e1ad81468862c2a", size = 233610, upload-time = "2025-09-12T15:05:04.542Z" }, ] [[package]] @@ -1359,8 +1359,8 @@ test = [ [package.metadata] requires-dist = [ - { name = "collective-person", specifier = "==1.0.0b1" }, - { name = "kitconcept-core", specifier = "==1.0.0a23" }, + { name = "collective-person", specifier = "==1.0.0b2" }, + { name = "kitconcept-core", specifier = "==1.0.0a24" }, { name = "kitconcept-solr", specifier = "==2.0.0a1" }, { name = "pas-plugins-authomatic", specifier = "==2.0.0" }, { name = "pas-plugins-keycloakgroups", specifier = "==1.0.0b1" }, diff --git a/backend/version.txt b/backend/version.txt index 0f872ecdd..f493ef2cc 100644 --- a/backend/version.txt +++ b/backend/version.txt @@ -1 +1 @@ -1.0.0a23 +1.0.0a24 diff --git a/frontend/cypress/tests/main/content/location.cy.js b/frontend/cypress/tests/main/content/location.cy.js index b407efc29..fcabb85f8 100644 --- a/frontend/cypress/tests/main/content/location.cy.js +++ b/frontend/cypress/tests/main/content/location.cy.js @@ -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', @@ -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', diff --git a/frontend/cypress/tests/main/content/person-content.cy.js b/frontend/cypress/tests/main/content/person-content.cy.js index b4f1b9e0e..da4c63e43 100644 --- a/frontend/cypress/tests/main/content/person-content.cy.js +++ b/frontend/cypress/tests/main/content/person-content.cy.js @@ -46,10 +46,6 @@ describe('Add Content Tests', () => { ) .contains('Institute of Robotics and Mechatronics(Organisational unit)') .click(); - cy.get('#field-roles').click(); - cy.get( - '#field-roles .react-select__menu .react-select__option:first-of-type', - ).click(); cy.get('#toolbar-save').focus().click(); cy.wait('@content'); }); diff --git a/frontend/mrs.developer.json b/frontend/mrs.developer.json index cdb7c03a3..2ef9dc918 100644 --- a/frontend/mrs.developer.json +++ b/frontend/mrs.developer.json @@ -22,7 +22,7 @@ "package": "@kitconcept/core", "url": "git@github.com:kitconcept/kitconcept-core.git", "https": "https://github.com/kitconcept/kitconcept-core.git", - "tag": "1.0.0a23" + "tag": "1.0.0a24" }, "volto-banner-block": { "develop": true, diff --git a/frontend/packages/volto-intranet/news/+personschema.bugfix b/frontend/packages/volto-intranet/news/+personschema.bugfix new file mode 100644 index 000000000..722e99974 --- /dev/null +++ b/frontend/packages/volto-intranet/news/+personschema.bugfix @@ -0,0 +1 @@ +Hide Roles field from Person edit form. @davisagli diff --git a/frontend/packages/volto-intranet/src/theme/_content.scss b/frontend/packages/volto-intranet/src/theme/_content.scss index c1a5ce546..3a676b97b 100644 --- a/frontend/packages/volto-intranet/src/theme/_content.scss +++ b/frontend/packages/volto-intranet/src/theme/_content.scss @@ -1,3 +1,6 @@ #sidebar-metadata #metadataform-fieldset-LCM { display: none; } +#sidebar-metadata .field-wrapper-roles { + display: none; +}