From 1ef4e82105a65b5932cfa4d0febd1fbf295dadc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mads=20N=C3=B8rgaard?= Date: Wed, 18 Aug 2021 21:03:23 +0200 Subject: [PATCH 1/5] =?UTF-8?q?Refactor=20Forl=C3=B8bsside=20and=20rename?= =?UTF-8?q?=20Webform=20content=20type.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/install/node.type.webform.yml | 2 +- config/install/user.role.flow_designer.yml | 9 --------- config/install/user.role.forloeb_designer.yml | 9 --------- config/install/user.role.leder.yml | 1 - config/install/user.role.sagsbehandler.yml | 10 ---------- 5 files changed, 1 insertion(+), 30 deletions(-) diff --git a/config/install/node.type.webform.yml b/config/install/node.type.webform.yml index 3d2a18e..a97915d 100644 --- a/config/install/node.type.webform.yml +++ b/config/install/node.type.webform.yml @@ -4,7 +4,7 @@ dependencies: enforced: module: - webform_node -name: Webform +name: Selvbetjeningsside type: webform description: 'A basic page with a webform attached.' help: '' diff --git a/config/install/user.role.flow_designer.yml b/config/install/user.role.flow_designer.yml index e0dc7dd..f2b30c8 100644 --- a/config/install/user.role.flow_designer.yml +++ b/config/install/user.role.flow_designer.yml @@ -36,27 +36,20 @@ permissions: - 'administer webform templates' - 'bypass entity print access' - 'bypass honeypot protection' -- 'create forloebsside content' - 'create webform' -- 'delete any forloebsside content' -- 'delete forloebsside revisions' - 'delete maestro entity identifiers entities' - 'delete maestro process entities' - 'delete maestro production assignment entities' - 'delete maestro queue entities' -- 'delete own forloebsside content' - 'delete webform submissions any node' - 'delete webform submissions own node' -- 'edit any forloebsside content' - 'edit maestro entity identifiers entities' - 'edit maestro process entities' - 'edit maestro production assignment entities' - 'edit maestro queue entities' -- 'edit own forloebsside content' - 'edit webform submissions any node' - 'edit webform submissions own node' - 'entity print access bundle contact' -- 'entity print access bundle forloebsside' - 'entity print access bundle template_contact' - 'entity print access bundle template_employee_evaluation' - 'entity print access bundle template_feedback' @@ -85,7 +78,6 @@ permissions: - 'entity print access type taxonomy_term' - 'entity print access type user' - 'entity print access type webform_submission' -- 'revert forloebsside revisions' - 'search content' - 'start maestro process' - 'start template form_approval_flow' @@ -99,7 +91,6 @@ permissions: - 'use udgivelse_af_forlob_og_webformularer transition publish' - 'use udgivelse_af_forlob_og_webformularer transition unpublish' - 'view any unpublished content' -- 'view forloebsside revisions' - 'view latest version' - 'view maestro entity identifiers entities' - 'view maestro process entities' diff --git a/config/install/user.role.forloeb_designer.yml b/config/install/user.role.forloeb_designer.yml index eda057a..3edf22c 100644 --- a/config/install/user.role.forloeb_designer.yml +++ b/config/install/user.role.forloeb_designer.yml @@ -36,15 +36,11 @@ permissions: - 'bypass entity print access' - 'bypass honeypot protection' - 'can be workflow participant' -- 'create forloebsside content' - 'create webform' - 'create webform content' -- 'delete any forloebsside content' - 'delete any webform' - 'delete any webform content' - 'delete any webform submission' -- 'delete forloebsside revisions' -- 'delete own forloebsside content' - 'delete own webform' - 'delete own webform content' - 'delete own webform submission' @@ -52,11 +48,9 @@ permissions: - 'delete webform revisions' - 'delete webform submissions any node' - 'delete webform submissions own node' -- 'edit any forloebsside content' - 'edit any webform' - 'edit any webform content' - 'edit any webform submission' -- 'edit own forloebsside content' - 'edit own webform' - 'edit own webform content' - 'edit own webform submission' @@ -65,7 +59,6 @@ permissions: - 'edit webform submissions own node' - 'edit webform twig' - 'entity print access bundle contact' -- 'entity print access bundle forloebsside' - 'entity print access bundle template_contact' - 'entity print access bundle template_employee_evaluation' - 'entity print access bundle template_feedback' @@ -89,7 +82,6 @@ permissions: - 'entity print access type taxonomy_term' - 'entity print access type user' - 'entity print access type webform_submission' -- 'revert forloebsside revisions' - 'revert webform revisions' - 'search content' - 'translate interface' @@ -102,7 +94,6 @@ permissions: - 'use udgivelse_af_forloeb transition publish' - 'view any unpublished content' - 'view any webform submission' -- 'view forloebsside revisions' - 'view latest version' - 'view own unpublished content' - 'view own webform submission' diff --git a/config/install/user.role.leder.yml b/config/install/user.role.leder.yml index 7787c85..f04c055 100644 --- a/config/install/user.role.leder.yml +++ b/config/install/user.role.leder.yml @@ -59,7 +59,6 @@ permissions: - 'edit webform submissions own node' - 'edit webform twig' - 'entity print access bundle contact' -- 'entity print access bundle forloebsside' - 'entity print access bundle template_contact' - 'entity print access bundle template_employee_evaluation' - 'entity print access bundle template_feedback' diff --git a/config/install/user.role.sagsbehandler.yml b/config/install/user.role.sagsbehandler.yml index 7d59e11..2efe015 100644 --- a/config/install/user.role.sagsbehandler.yml +++ b/config/install/user.role.sagsbehandler.yml @@ -23,18 +23,10 @@ permissions: - 'administer webform element access' - 'administer webform submission' - 'bypass honeypot protection' -- 'create forloebsside content' -- 'delete any forloebsside content' -- 'delete forloebsside revisions' -- 'delete own forloebsside content' -- 'edit any forloebsside content' -- 'edit own forloebsside content' - 'edit own webform submission' -- 'entity print access bundle forloebsside' - 'entity print access bundle hk_grundskabelon' - 'entity print access type user' - 'entity print access type webform_submission' -- 'revert forloebsside revisions' - 'search content' - 'start template content_moderation' - 'use advanced search' @@ -42,8 +34,6 @@ permissions: - 'use text format full_html' - 'view any unpublished content' - 'view any webform submission' -- 'view forloebsside revisions' -- 'view forloebsside revisions' - 'view latest version' - 'view maestro entity identifiers entities' - 'view maestro process entities' From 7a60c4b64231ba26d59c06a8c0857ad4d359ce93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mads=20N=C3=B8rgaard?= Date: Wed, 18 Aug 2021 21:08:08 +0200 Subject: [PATCH 2/5] Set permissions to manage own workflow participants. --- config/install/user.role.flow_designer.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/install/user.role.flow_designer.yml b/config/install/user.role.flow_designer.yml index e0dc7dd..4fdde1c 100644 --- a/config/install/user.role.flow_designer.yml +++ b/config/install/user.role.flow_designer.yml @@ -85,6 +85,7 @@ permissions: - 'entity print access type taxonomy_term' - 'entity print access type user' - 'entity print access type webform_submission' +- 'manage own workflow participants' - 'revert forloebsside revisions' - 'search content' - 'start maestro process' From ea761ea03b41576c28c3bfb5dfa0e70e1aa642b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mads=20N=C3=B8rgaard?= Date: Wed, 18 Aug 2021 21:54:58 +0200 Subject: [PATCH 3/5] Allow flowdesigner to import configurations. --- config/install/user.role.flow_designer.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/install/user.role.flow_designer.yml b/config/install/user.role.flow_designer.yml index e0dc7dd..43bd1f8 100644 --- a/config/install/user.role.flow_designer.yml +++ b/config/install/user.role.flow_designer.yml @@ -85,6 +85,7 @@ permissions: - 'entity print access type taxonomy_term' - 'entity print access type user' - 'entity print access type webform_submission' +- 'import configuration' - 'revert forloebsside revisions' - 'search content' - 'start maestro process' From 41d60ca8e23cb5436e799a9aa51bcb70417a9d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mads=20N=C3=B8rgaard?= Date: Wed, 22 Sep 2021 13:50:19 +0200 Subject: [PATCH 4/5] Adding dependencies to fix build. --- composer.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 98f8b32..5c654c2 100644 --- a/composer.json +++ b/composer.json @@ -16,6 +16,8 @@ } }, "require": { - "drupal/core": "^8" + "drupal/core": "^8", + "drupal/memcache": "^2.3", + "os2forms/os2forms_forloeb": "^1.0" } } From b51b016b52406e585283f882cb5266737f5a8803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mads=20N=C3=B8rgaard?= Date: Wed, 22 Sep 2021 14:53:58 +0200 Subject: [PATCH 5/5] Rollback of previous merge. --- composer.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 5c654c2..98f8b32 100644 --- a/composer.json +++ b/composer.json @@ -16,8 +16,6 @@ } }, "require": { - "drupal/core": "^8", - "drupal/memcache": "^2.3", - "os2forms/os2forms_forloeb": "^1.0" + "drupal/core": "^8" } }