From a70442b2c8e077256762f2e8c71b0d31ce8a4b56 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Tue, 5 Sep 2023 15:30:42 +0100 Subject: [PATCH 01/25] Added Drupal 10 support #377 --- localgov_microsites_group.info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localgov_microsites_group.info.yml b/localgov_microsites_group.info.yml index f2c91d0f..ab12a502 100644 --- a/localgov_microsites_group.info.yml +++ b/localgov_microsites_group.info.yml @@ -2,7 +2,7 @@ name: LocalGov Microsites Group type: module description: Group integration for Microsites. package: LocalGov Drupal -core_version_requirement: ^9.3 +core_version_requirement: ^9.3 || v10 dependencies: # Drupal - drupal:image From cbe6dc06733417bfdbe51b7846615597d4a3e794 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Tue, 5 Sep 2023 15:36:20 +0100 Subject: [PATCH 02/25] Fixed D10 requirement --- localgov_microsites_group.info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localgov_microsites_group.info.yml b/localgov_microsites_group.info.yml index ab12a502..8c7028d9 100644 --- a/localgov_microsites_group.info.yml +++ b/localgov_microsites_group.info.yml @@ -2,7 +2,7 @@ name: LocalGov Microsites Group type: module description: Group integration for Microsites. package: LocalGov Drupal -core_version_requirement: ^9.3 || v10 +core_version_requirement: ^9.3 || ^10 dependencies: # Drupal - drupal:image From 7d94126244f2f3017e755b87df9330b2e484db4e Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Tue, 5 Sep 2023 15:46:03 +0100 Subject: [PATCH 03/25] Update all module requirements to support Drupal 10 --- composer.json | 1 - .../localgov_microsites_blogs.info.yml | 2 +- .../localgov_microsites_directories.info.yml | 2 +- .../localgov_microsites_events.info.yml | 2 +- .../localgov_microsites_group_term_ui.info.yml | 2 +- .../localgov_microsites_group_webform.info.yml | 2 +- .../localgov_microsites_news/localgov_microsites_news.info.yml | 2 +- .../localgov_microsites_permissions.info.yml | 2 +- 8 files changed, 7 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index ef8a2e70..c9ecdf22 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,6 @@ "type": "drupal-module", "license": "GPL-2.0-or-later", "require": { - "drupal/core": "^9", "drupal/domain_path": "^1.2", "drupal/field_formatter_class": "^1.5", "drupal/ginvite": "4.0.0-alpha1", diff --git a/modules/localgov_microsites_blogs/localgov_microsites_blogs.info.yml b/modules/localgov_microsites_blogs/localgov_microsites_blogs.info.yml index 4acfa888..074bcca1 100644 --- a/modules/localgov_microsites_blogs/localgov_microsites_blogs.info.yml +++ b/modules/localgov_microsites_blogs/localgov_microsites_blogs.info.yml @@ -2,7 +2,7 @@ name: Localgov Microsites Blogs description: LocalGov Blogs integration with Microsites. type: module package: LocalGov Drupal -core_version_requirement: ^9 +core_version_requirement: ^9 || ^10 dependencies: - group:gnode - group_term:group_term diff --git a/modules/localgov_microsites_directories/localgov_microsites_directories.info.yml b/modules/localgov_microsites_directories/localgov_microsites_directories.info.yml index 4c0fce55..f95e9c44 100644 --- a/modules/localgov_microsites_directories/localgov_microsites_directories.info.yml +++ b/modules/localgov_microsites_directories/localgov_microsites_directories.info.yml @@ -2,7 +2,7 @@ name: Localgov Microsites Directories description: LocalGov Directories integration with Microsites. type: module package: LocalGov Drupal -core_version_requirement: ^9 +core_version_requirement: ^9 || ^10 dependencies: - drupal:views - localgov_directories:localgov_directories diff --git a/modules/localgov_microsites_events/localgov_microsites_events.info.yml b/modules/localgov_microsites_events/localgov_microsites_events.info.yml index 186e75e2..a651d404 100644 --- a/modules/localgov_microsites_events/localgov_microsites_events.info.yml +++ b/modules/localgov_microsites_events/localgov_microsites_events.info.yml @@ -2,7 +2,7 @@ name: Localgov Microsites Events description: LocalGov Events integration with Microsites. type: module package: LocalGov Drupal -core_version_requirement: ^9 +core_version_requirement: ^9 || ^10 dependencies: - group:gnode - group_term:group_term diff --git a/modules/localgov_microsites_group_term_ui/localgov_microsites_group_term_ui.info.yml b/modules/localgov_microsites_group_term_ui/localgov_microsites_group_term_ui.info.yml index 3eace489..822acbd7 100644 --- a/modules/localgov_microsites_group_term_ui/localgov_microsites_group_term_ui.info.yml +++ b/modules/localgov_microsites_group_term_ui/localgov_microsites_group_term_ui.info.yml @@ -2,7 +2,7 @@ name: LocalgGov Microsites Group Term UI type: module description: Provides a UI for the Group Term module for use with LocalGov Microsites. package: LocalGov Drupal -core_version_requirement: ^9 +core_version_requirement: ^9 || ^10 dependencies: - domain_group:domain_group - drupal:taxonomy diff --git a/modules/localgov_microsites_group_webform/localgov_microsites_group_webform.info.yml b/modules/localgov_microsites_group_webform/localgov_microsites_group_webform.info.yml index 5cd082d5..27a06675 100644 --- a/modules/localgov_microsites_group_webform/localgov_microsites_group_webform.info.yml +++ b/modules/localgov_microsites_group_webform/localgov_microsites_group_webform.info.yml @@ -2,7 +2,7 @@ name: LocalGov Microsites Group Webform type: module description: Webform integration for Microsites. package: LocalGov Drupal -core_version_requirement: ^9.3 +core_version_requirement: ^9.3 || ^10 dependencies: # Drupal - core:inline_form_errors diff --git a/modules/localgov_microsites_news/localgov_microsites_news.info.yml b/modules/localgov_microsites_news/localgov_microsites_news.info.yml index d41b8257..1db324ec 100644 --- a/modules/localgov_microsites_news/localgov_microsites_news.info.yml +++ b/modules/localgov_microsites_news/localgov_microsites_news.info.yml @@ -2,7 +2,7 @@ name: Localgov Microsites News description: LocalGov Newsroom integration with Microsites. type: module package: LocalGov Drupal -core_version_requirement: ^9 +core_version_requirement: ^9 || ^10 dependencies: - group:gnode - group_term:group_term diff --git a/modules/localgov_microsites_permissions/localgov_microsites_permissions.info.yml b/modules/localgov_microsites_permissions/localgov_microsites_permissions.info.yml index 86be4b20..64e4abf5 100644 --- a/modules/localgov_microsites_permissions/localgov_microsites_permissions.info.yml +++ b/modules/localgov_microsites_permissions/localgov_microsites_permissions.info.yml @@ -2,6 +2,6 @@ name: Localgov Microsites Permissions type: module description: Permissions for Microsite groups. package: LocalGov Drupal -core_version_requirement: ^9 +core_version_requirement: ^9 || ^10 dependencies: - group_permissions:group_permissions From 6fc3af95770f8ecb75c0b8eb9d5fd060ec49d415 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Tue, 5 Sep 2023 16:13:41 +0100 Subject: [PATCH 04/25] Require Drupal 10 compatible module versions --- composer.json | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index c9ecdf22..b83b193b 100644 --- a/composer.json +++ b/composer.json @@ -8,18 +8,17 @@ "drupal/field_formatter_class": "^1.5", "drupal/ginvite": "4.0.0-alpha1", "drupal/group": "^3.0.0-beta4", - "drupal/group_content_menu": "dev-3.0.x#0c85b43d", + "drupal/group_content_menu": "^3.0", "drupal/group_permissions": "2.0.0-alpha5", - "drupal/group_term": "4.0.0-alpha5", - "drupal/groupmedia": "4.0.0-alpha1 ", + "drupal/group_term": "^4.0", + "drupal/groupmedia": "^4.0", "drupal/override_node_options": "^2.6", "drupal/replicate": "^1.0", "drupal/role_delegation": "^1.2", - "localgovdrupal/group_webform": "^1.0.0-beta1", - "localgovdrupal/localgov_core": "^2.1.0", - "localgovdrupal/localgov_forms": "^1.0.0-beta1", - "localgovdrupal/localgov_page": "^1.0.0-beta1", - "localgovdrupal/localgov_search": "^1.1" + "localgovdrupal/group_webform": "dev-3287825-drupal-10", + "localgovdrupal/localgov_core": "^2.12", + "localgovdrupal/localgov_forms": "dev-feature/1.x/42-drupal-10 as 1.0.0-beta1", + "localgovdrupal/localgov_search": "^1.2" }, "require-dev": { "localgovdrupal/localgov_news": "^2.1", From b12d844a6607bb86e94fd7dc6c2874ba8ca5f63d Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Tue, 5 Sep 2023 16:20:26 +0100 Subject: [PATCH 05/25] Fixed reference to localgovdrupal/group_webform --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b83b193b..46477760 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "drupal/override_node_options": "^2.6", "drupal/replicate": "^1.0", "drupal/role_delegation": "^1.2", - "localgovdrupal/group_webform": "dev-3287825-drupal-10", + "localgovdrupal/group_webform": "dev-feature/1.x/6-drupal-10 as 1.0.0-beta1", "localgovdrupal/localgov_core": "^2.12", "localgovdrupal/localgov_forms": "dev-feature/1.x/42-drupal-10 as 1.0.0-beta1", "localgovdrupal/localgov_search": "^1.2" From 90d61e061e0c97d3fdfad8c9f66fc1670262c9dc Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Tue, 5 Sep 2023 16:23:35 +0100 Subject: [PATCH 06/25] Updated group version requirement --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 46477760..d0bfc3b5 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "drupal/domain_path": "^1.2", "drupal/field_formatter_class": "^1.5", "drupal/ginvite": "4.0.0-alpha1", - "drupal/group": "^3.0.0-beta4", + "drupal/group": "^3.2", "drupal/group_content_menu": "^3.0", "drupal/group_permissions": "2.0.0-alpha5", "drupal/group_term": "^4.0", From 0ac68acb48633bc9d62655732ecf507d864714f7 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Wed, 6 Sep 2023 16:31:25 +0100 Subject: [PATCH 07/25] Changed Microsites overview view so it's only accessible to Microsite Controllers #416 --- .../views.view.localgov_microsites_overview.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/config/optional/views.view.localgov_microsites_overview.yml b/config/optional/views.view.localgov_microsites_overview.yml index 676907cb..03276062 100644 --- a/config/optional/views.view.localgov_microsites_overview.yml +++ b/config/optional/views.view.localgov_microsites_overview.yml @@ -4,6 +4,7 @@ dependencies: config: - group.type.microsite - system.menu.admin + - user.role.microsites_controller module: - group - user @@ -168,9 +169,10 @@ display: sort_asc_label: Asc sort_desc_label: Desc access: - type: perm + type: role options: - perm: 'bypass group access' + role: + microsites_controller: microsites_controller cache: type: tag options: { } @@ -251,7 +253,7 @@ display: - 'languages:language_content' - 'languages:language_interface' - url.query_args - - user.permissions + - user.roles tags: { } collection: id: collection @@ -276,5 +278,5 @@ display: - 'languages:language_content' - 'languages:language_interface' - url.query_args - - user.permissions + - user.roles tags: { } From bc15edfa8c114f0d268173b19a3c3f7fae41c636 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Wed, 6 Sep 2023 16:49:13 +0100 Subject: [PATCH 08/25] Removed nonexistent permission 'bypass group access' --- config/install/user.role.microsites_controller.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/install/user.role.microsites_controller.yml b/config/install/user.role.microsites_controller.yml index aeb40166..a5ebe519 100644 --- a/config/install/user.role.microsites_controller.yml +++ b/config/install/user.role.microsites_controller.yml @@ -30,7 +30,6 @@ permissions: - 'assign microsites_controller role' - 'assign microsites_trusted_editor role' - 'bypass domain group permissions' - - 'bypass group access' - 'cancel account' - 'change own username' - 'create document media' From 56707f8bea093f1e71d1688562e19f139f3019b0 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Wed, 6 Sep 2023 17:34:19 +0100 Subject: [PATCH 09/25] Fixing nonexistent permissiobs #415 --- config/install/user.role.microsites_controller.yml | 2 +- .../localgov_microsites_directories.module | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/install/user.role.microsites_controller.yml b/config/install/user.role.microsites_controller.yml index a5ebe519..70a688cd 100644 --- a/config/install/user.role.microsites_controller.yml +++ b/config/install/user.role.microsites_controller.yml @@ -11,6 +11,7 @@ dependencies: - domain_path - group - media + - role_delegation - system - toolbar - tour @@ -42,7 +43,6 @@ permissions: - 'edit any image media' - 'edit any remote_video media' - 'edit domain path entity' - - 'edit layout paragraphs plugin config' - 'edit own document media' - 'edit own image media' - 'edit own remote_video media' diff --git a/modules/localgov_microsites_directories/localgov_microsites_directories.module b/modules/localgov_microsites_directories/localgov_microsites_directories.module index 6de5969e..097074c3 100644 --- a/modules/localgov_microsites_directories/localgov_microsites_directories.module +++ b/modules/localgov_microsites_directories/localgov_microsites_directories.module @@ -91,6 +91,7 @@ function localgov_microsites_directories_localgov_microsites_roles_default() { 'delete geo', 'edit directory facets', 'edit geo', + 'edit layout paragraphs plugin config', 'view directory facets', ], RolesHelper::MICROSITES_EDITOR_ROLE => [ From 5f1fc12a44046210ac7c0b0a2ee6d49c35e7eb64 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Fri, 8 Sep 2023 12:11:15 +0100 Subject: [PATCH 10/25] Fixing nonexistent permission errors --- composer.json | 4 ++-- config/install/user.role.microsites_controller.yml | 2 -- .../user.role.microsites_trusted_editor.yml | 1 + localgov_microsites_group.info.yml | 1 + localgov_microsites_group.module | 14 ++++++++++++++ .../localgov_microsites_directories.module | 5 ++--- .../localgov_microsites_events.module | 4 ++-- 7 files changed, 22 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index d0bfc3b5..c9fa5e23 100644 --- a/composer.json +++ b/composer.json @@ -22,8 +22,8 @@ }, "require-dev": { "localgovdrupal/localgov_news": "^2.1", - "localgovdrupal/localgov_directories": "^2.2", - "localgovdrupal/localgov_events": "^2.0" + "localgovdrupal/localgov_directories": "^3.0@alpha", + "localgovdrupal/localgov_events": "^3.0@alpha" }, "suggests": { "localgovdrupal/localgov_directories": "For directories content type in microsites", diff --git a/config/install/user.role.microsites_controller.yml b/config/install/user.role.microsites_controller.yml index 70a688cd..eceb7aad 100644 --- a/config/install/user.role.microsites_controller.yml +++ b/config/install/user.role.microsites_controller.yml @@ -28,8 +28,6 @@ permissions: - 'administer domains' - 'administer media' - 'administer users' - - 'assign microsites_controller role' - - 'assign microsites_trusted_editor role' - 'bypass domain group permissions' - 'cancel account' - 'change own username' diff --git a/config/install/user.role.microsites_trusted_editor.yml b/config/install/user.role.microsites_trusted_editor.yml index 42ef5a73..fa0039f9 100644 --- a/config/install/user.role.microsites_trusted_editor.yml +++ b/config/install/user.role.microsites_trusted_editor.yml @@ -9,6 +9,7 @@ dependencies: - media - system - domain_path + - layout_paragraphs_permissions - localgov_sa11y - override_node_options id: microsites_trusted_editor diff --git a/localgov_microsites_group.info.yml b/localgov_microsites_group.info.yml index 8c7028d9..4c58cfc2 100644 --- a/localgov_microsites_group.info.yml +++ b/localgov_microsites_group.info.yml @@ -23,6 +23,7 @@ dependencies: - groupmedia_paragraphs:groupmedia_paragraphs - group_permissions:group_permissions - group_content_menu:group_content_menu + - layout_paragraphs:layout_paragraphs_permissions - media_library:media_library - override_node_options:override_node_options - replicate:replicate diff --git a/localgov_microsites_group.module b/localgov_microsites_group.module index 4c7b9bb8..4455d74c 100644 --- a/localgov_microsites_group.module +++ b/localgov_microsites_group.module @@ -463,3 +463,17 @@ function localgov_microsites_group_toolbar() { ], ]; } + +/** + * Implements hook_localgov_microsites_roles_default(). + */ +function llocalgov_microsites_group_localgov_microsites_roles_default() { + return [ + 'global' => [ + RolesHelper::MICROSITES_CONTROLLER_ROLE => [ + 'assign microsites_controller role', + 'assign microsites_trusted_editor role', + ], + ], + ]; +} \ No newline at end of file diff --git a/modules/localgov_microsites_directories/localgov_microsites_directories.module b/modules/localgov_microsites_directories/localgov_microsites_directories.module index 097074c3..dce87aa0 100644 --- a/modules/localgov_microsites_directories/localgov_microsites_directories.module +++ b/modules/localgov_microsites_directories/localgov_microsites_directories.module @@ -84,18 +84,17 @@ function localgov_microsites_directories_localgov_microsites_roles_default() { return [ 'global' => [ RolesHelper::MICROSITES_CONTROLLER_ROLE => [ - 'access localgov_geo_library entity browser pages', + 'access geo_entity_library entity browser pages', 'create directory facets', 'create geo', 'delete directory facets', 'delete geo', 'edit directory facets', 'edit geo', - 'edit layout paragraphs plugin config', 'view directory facets', ], RolesHelper::MICROSITES_EDITOR_ROLE => [ - 'access localgov_geo_library entity browser pages', + 'access geo_entity_library entity browser pages', 'create directory facets', 'create geo', 'delete directory facets', diff --git a/modules/localgov_microsites_events/localgov_microsites_events.module b/modules/localgov_microsites_events/localgov_microsites_events.module index f7dbe574..89ef08b0 100644 --- a/modules/localgov_microsites_events/localgov_microsites_events.module +++ b/modules/localgov_microsites_events/localgov_microsites_events.module @@ -14,13 +14,13 @@ function localgov_microsites_events_localgov_microsites_roles_default() { return [ 'global' => [ RolesHelper::MICROSITES_CONTROLLER_ROLE => [ - 'access localgov_geo_library entity browser pages', + 'access geo_entity_library entity browser pages', 'create geo', 'delete geo', 'edit geo', ], RolesHelper::MICROSITES_EDITOR_ROLE => [ - 'access localgov_geo_library entity browser pages', + 'access geo_entity_library entity browser pages', 'create geo', 'delete geo', 'edit geo', From f210aa3282fcc3933bdc5d918ed7a1c003b4cc78 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Fri, 8 Sep 2023 12:23:40 +0100 Subject: [PATCH 11/25] Fixed block visibility settings --- .../block.block.localgov_directories_channel_search_block.yml | 2 +- .../config/optional/block.block.localgov_directories_facets.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/localgov_microsites_directories/config/optional/block.block.localgov_directories_channel_search_block.yml b/modules/localgov_microsites_directories/config/optional/block.block.localgov_directories_channel_search_block.yml index 0ecbc88e..a8e0b585 100644 --- a/modules/localgov_microsites_directories/config/optional/block.block.localgov_directories_channel_search_block.yml +++ b/modules/localgov_microsites_directories/config/optional/block.block.localgov_directories_channel_search_block.yml @@ -21,7 +21,7 @@ settings: node: '@node.node_route_context:node' visibility: node_type: - id: node_type + id: entity_bundle:node bundles: localgov_directory: localgov_directory negate: false diff --git a/modules/localgov_microsites_directories/config/optional/block.block.localgov_directories_facets.yml b/modules/localgov_microsites_directories/config/optional/block.block.localgov_directories_facets.yml index 7d365782..f91e1d4f 100644 --- a/modules/localgov_microsites_directories/config/optional/block.block.localgov_directories_facets.yml +++ b/modules/localgov_microsites_directories/config/optional/block.block.localgov_directories_facets.yml @@ -22,7 +22,7 @@ settings: block_id: localgov_directories_facets visibility: node_type: - id: node_type + id: entity_bundle:node bundles: localgov_directory: localgov_directory negate: false From bf8580b8a5b67750e0f667debaafe33ef7e416cb Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Fri, 8 Sep 2023 12:31:45 +0100 Subject: [PATCH 12/25] Fixed type in hook name --- localgov_microsites_group.module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localgov_microsites_group.module b/localgov_microsites_group.module index 4455d74c..bb821c83 100644 --- a/localgov_microsites_group.module +++ b/localgov_microsites_group.module @@ -467,7 +467,7 @@ function localgov_microsites_group_toolbar() { /** * Implements hook_localgov_microsites_roles_default(). */ -function llocalgov_microsites_group_localgov_microsites_roles_default() { +function localgov_microsites_group_localgov_microsites_roles_default() { return [ 'global' => [ RolesHelper::MICROSITES_CONTROLLER_ROLE => [ From 967cc50decbaefb4a3902ad805ca99af87bd6beb Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Fri, 8 Sep 2023 12:39:46 +0100 Subject: [PATCH 13/25] Coding standards fixes --- localgov_microsites_group.module | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localgov_microsites_group.module b/localgov_microsites_group.module index bb821c83..a62682de 100644 --- a/localgov_microsites_group.module +++ b/localgov_microsites_group.module @@ -476,4 +476,4 @@ function localgov_microsites_group_localgov_microsites_roles_default() { ], ], ]; -} \ No newline at end of file +} From 6a0e4ba959555ac97aeb9b1073bd144719720d3f Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Fri, 8 Sep 2023 12:50:28 +0100 Subject: [PATCH 14/25] Added 'access microsites overview' permission --- config/install/user.role.microsites_controller.yml | 1 + .../optional/views.view.localgov_microsites_overview.yml | 9 ++++----- localgov_microsites_group.permissions.yml | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 localgov_microsites_group.permissions.yml diff --git a/config/install/user.role.microsites_controller.yml b/config/install/user.role.microsites_controller.yml index eceb7aad..ce048511 100644 --- a/config/install/user.role.microsites_controller.yml +++ b/config/install/user.role.microsites_controller.yml @@ -22,6 +22,7 @@ is_admin: null permissions: - 'access administration pages' - 'access media overview' + - 'access microsites overview' - 'access toolbar' - 'access tour' - 'access user profiles' diff --git a/config/optional/views.view.localgov_microsites_overview.yml b/config/optional/views.view.localgov_microsites_overview.yml index 03276062..aacfed19 100644 --- a/config/optional/views.view.localgov_microsites_overview.yml +++ b/config/optional/views.view.localgov_microsites_overview.yml @@ -169,10 +169,9 @@ display: sort_asc_label: Asc sort_desc_label: Desc access: - type: role + type: perm options: - role: - microsites_controller: microsites_controller + perm: 'access microsites overview' cache: type: tag options: { } @@ -253,7 +252,7 @@ display: - 'languages:language_content' - 'languages:language_interface' - url.query_args - - user.roles + - user.permissions tags: { } collection: id: collection @@ -278,5 +277,5 @@ display: - 'languages:language_content' - 'languages:language_interface' - url.query_args - - user.roles + - user.permissions tags: { } diff --git a/localgov_microsites_group.permissions.yml b/localgov_microsites_group.permissions.yml new file mode 100644 index 00000000..af2fb66d --- /dev/null +++ b/localgov_microsites_group.permissions.yml @@ -0,0 +1,2 @@ +access microsites overview: + title: 'Access the Microcistes overview page' \ No newline at end of file From 48c8892f5f9f604187f6474fb9b22f0c16d217a9 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Fri, 8 Sep 2023 12:52:17 +0100 Subject: [PATCH 15/25] Coding standards fix --- localgov_microsites_group.permissions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localgov_microsites_group.permissions.yml b/localgov_microsites_group.permissions.yml index af2fb66d..e929f351 100644 --- a/localgov_microsites_group.permissions.yml +++ b/localgov_microsites_group.permissions.yml @@ -1,2 +1,2 @@ access microsites overview: - title: 'Access the Microcistes overview page' \ No newline at end of file + title: 'Access the Microcistes overview page' From 668f7f199c40c919769fb4a85f089cbc8091a51b Mon Sep 17 00:00:00 2001 From: Finn Lewis Date: Fri, 8 Sep 2023 15:08:39 +0100 Subject: [PATCH 16/25] Remove patch for groupmedia --- composer.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/composer.json b/composer.json index c9fa5e23..e1573e2c 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ "drupal/group_content_menu": "^3.0", "drupal/group_permissions": "2.0.0-alpha5", "drupal/group_term": "^4.0", - "drupal/groupmedia": "^4.0", + "drupal/groupmedia": "^4.0.1", "drupal/override_node_options": "^2.6", "drupal/replicate": "^1.0", "drupal/role_delegation": "^1.2", @@ -40,9 +40,6 @@ "domain_path_pathauto creates duplicate aliases #3285213": "https://www.drupal.org/files/issues/2022-06-11/domain_path_pathauto-obey-current-domain_id-querying-for-reserved-aliases-3285213.patch", "Warning: Undefined array key 'pathauto' #3315752": "https://www.drupal.org/files/issues/2022-10-17/undefined-array-key-pathauto-3265497-2.patch" }, - "drupal/groupmedia": { - "Update addPage in groupmediato work with Group 3.x and suppress errors #3325129": "https://git.drupalcode.org/issue/groupmedia-3325129/-/commit/194f7bfa1d51f9a34a00ab4323f5fdf8c82ff48b.patch" - }, "drupal/ginvite": { "View schema fix #3324625": "https://www.drupal.org/files/issues/2022-11-30/3324625-2-schema-fix-for-4.0.x.patch" } From ee88d5c2bf9b2f96a3c4d7f87acca06c8b331d75 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Fri, 8 Sep 2023 15:15:51 +0100 Subject: [PATCH 17/25] Run Github tests against 3.x branch and Drupal 10 --- .github/workflows/localgov_microsites.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/localgov_microsites.yml b/.github/workflows/localgov_microsites.yml index af2aecab..61db5a6c 100644 --- a/.github/workflows/localgov_microsites.yml +++ b/.github/workflows/localgov_microsites.yml @@ -6,15 +6,14 @@ name: Test LocalGov Microsites localgovdrupal/localgov_microsites_group drupal-m on: push: branches: - - '2.x' + - '3.x' pull_request: branches: - - '2.x' + - '3.x' env: LOCALGOV_DRUPAL_PROJECT: localgovdrupal/localgov_microsites_group LOCALGOV_DRUPAL_PROJECT_PATH: web/modules/contrib/localgov_microsites_group - MICROSITES_VERSION: 2.1.x jobs: @@ -26,9 +25,9 @@ jobs: fail-fast: false matrix: localgov-version: - - '2.x' + - '3.x' drupal-version: - - '~9.3' + - '~10.0' php-version: - '8.1' @@ -83,7 +82,7 @@ jobs: - name: Create LocalGov Microsites project run: | composer create-project --stability dev --no-install localgovdrupal/localgov_microsites_project ./html "${{ matrix.localgov-version }}" - composer --working-dir=./html require --no-install localgovdrupal/localgov_microsites:${MICROSITES_VERSION}-dev + composer --working-dir=./html require --no-install localgovdrupal/localgov_microsites:${{ matrix.localgov-version }}-dev composer --working-dir=./html require --no-install drupal/core-recommended:${{ matrix.drupal-version }} drupal/core-composer-scaffold:${{ matrix.drupal-version }} drupal/core-project-message:${{ matrix.drupal-version }} drupal/core-dev:${{ matrix.drupal-version }} composer --working-dir=./html install @@ -109,9 +108,9 @@ jobs: fail-fast: false matrix: localgov-version: - - '2.x' + - '3.x' drupal-version: - - '~9.3' + - '~10.0' php-version: - '8.1' @@ -144,9 +143,9 @@ jobs: fail-fast: false matrix: localgov-version: - - '2.x' + - '3.x' drupal-version: - - '~9.3' + - '~10.0' php-version: - '8.1' @@ -178,9 +177,9 @@ jobs: fail-fast: false matrix: localgov-version: - - '2.x' + - '3.x' drupal-version: - - '~9.3' + - '~10.0' php-version: - '8.1' From 1c136d1b7cb332c46b71e78dcd036cc3fd6895f1 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Fri, 8 Sep 2023 16:14:32 +0100 Subject: [PATCH 18/25] Started fixing tests --- ...algov_microsites_group_term_ui_test.info.yml | 2 +- .../src/Functional/MicrositeNewsContentTest.php | 2 +- .../localgov_microsites_roles_test.info.yml | 2 +- tests/src/Functional/LoginTest.php | 2 +- tests/src/Kernel/GroupPermissionsHelperTest.php | 17 ++++++++++++++++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/modules/localgov_microsites_group_term_ui/tests/modules/localgov_microsites_group_term_ui_test/localgov_microsites_group_term_ui_test.info.yml b/modules/localgov_microsites_group_term_ui/tests/modules/localgov_microsites_group_term_ui_test/localgov_microsites_group_term_ui_test.info.yml index fe780e65..9819f5de 100644 --- a/modules/localgov_microsites_group_term_ui/tests/modules/localgov_microsites_group_term_ui_test/localgov_microsites_group_term_ui_test.info.yml +++ b/modules/localgov_microsites_group_term_ui/tests/modules/localgov_microsites_group_term_ui_test/localgov_microsites_group_term_ui_test.info.yml @@ -2,6 +2,6 @@ name: 'LocalGov Microsites Group Term UI test' description: 'Support module for LocalGov Microsites Group Term UI tests.' package: 'Testing' type: 'module' -core_version_requirement: ^8.8 || ^9 +core_version_requirement: ^8.8 || ^9 || ^10 dependencies: - localgov_microsites_group:localgov_microsites_group_term_ui diff --git a/modules/localgov_microsites_news/tests/src/Functional/MicrositeNewsContentTest.php b/modules/localgov_microsites_news/tests/src/Functional/MicrositeNewsContentTest.php index fadb4ba4..ea78d2e2 100644 --- a/modules/localgov_microsites_news/tests/src/Functional/MicrositeNewsContentTest.php +++ b/modules/localgov_microsites_news/tests/src/Functional/MicrositeNewsContentTest.php @@ -53,7 +53,7 @@ class MicrositeNewsContentTest extends BrowserTestBase { /** * {@inheritdoc} */ - protected function setUp() { + protected function setUp(): void { parent::setUp(); // Set base hostname. diff --git a/tests/modules/localgov_microsites_roles_test/localgov_microsites_roles_test.info.yml b/tests/modules/localgov_microsites_roles_test/localgov_microsites_roles_test.info.yml index 8e9f83d2..25535ff2 100644 --- a/tests/modules/localgov_microsites_roles_test/localgov_microsites_roles_test.info.yml +++ b/tests/modules/localgov_microsites_roles_test/localgov_microsites_roles_test.info.yml @@ -2,7 +2,7 @@ name: 'LocalGov Micosites Roles Test' type: module description: 'Support module for LocalGov Microsites role tests' package: Testing -core_version_requirement: ^9 +core_version_requirement: ^9 || ^10 dependencies: - localgov_microsites_group:localgov_microsites_group hidden: true diff --git a/tests/src/Functional/LoginTest.php b/tests/src/Functional/LoginTest.php index 68bb9d40..b1dddd55 100644 --- a/tests/src/Functional/LoginTest.php +++ b/tests/src/Functional/LoginTest.php @@ -56,7 +56,7 @@ class LoginTest extends BrowserTestBase { /** * {@inheritdoc} */ - protected function setUp() { + protected function setUp():void { parent::setUp(); // Create test user. diff --git a/tests/src/Kernel/GroupPermissionsHelperTest.php b/tests/src/Kernel/GroupPermissionsHelperTest.php index be4ed622..010d770a 100644 --- a/tests/src/Kernel/GroupPermissionsHelperTest.php +++ b/tests/src/Kernel/GroupPermissionsHelperTest.php @@ -21,9 +21,12 @@ class GroupPermissionsHelperTest extends GroupKernelTestBase { /** * {@inheritdoc} */ - public static $modules = [ + protected static $modules = [ 'domain', 'domain_group', + 'domain_path', + 'entity_browser', + 'entity_browser_entity_form', 'entity_reference_revisions', 'field_formatter_class', 'field_group', @@ -31,6 +34,8 @@ class GroupPermissionsHelperTest extends GroupKernelTestBase { 'image', 'media', 'media_library', + 'geo_entity', + 'geofield', 'gnode', 'groupmedia', 'group_content_menu', @@ -38,16 +43,23 @@ class GroupPermissionsHelperTest extends GroupKernelTestBase { 'group_term', 'layout_discovery', 'layout_paragraphs', + 'layout_paragraphs_permissions', 'node', + 'override_node_options', 'paragraphs', + 'path_alias', 'replicate', 'taxonomy', + 'toolbar', + 'tour', 'user', 'views', + 'localgov_geo', 'localgov_media', 'localgov_microsites_events', 'localgov_microsites_group', 'localgov_paragraphs_layout', + 'localgov_sa11y', ]; /** @@ -91,7 +103,10 @@ protected function setUp(): void { $this->installSchema('file', 'file_usage'); $this->installConfig([ + 'geo_entity', 'gnode', + 'override_node_options', + 'user', 'localgov_media', 'localgov_paragraphs_layout', 'localgov_microsites_group', From c6014f71725f4f79db82ec470d2e0dc8ef5feedf Mon Sep 17 00:00:00 2001 From: Finn Lewis Date: Mon, 11 Sep 2023 18:27:25 +0100 Subject: [PATCH 19/25] Update version constraint for group_form since release. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c9fa5e23..ec9ed4ab 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "drupal/override_node_options": "^2.6", "drupal/replicate": "^1.0", "drupal/role_delegation": "^1.2", - "localgovdrupal/group_webform": "dev-feature/1.x/6-drupal-10 as 1.0.0-beta1", + "localgovdrupal/group_webform": "^1.0.0-beta2", "localgovdrupal/localgov_core": "^2.12", "localgovdrupal/localgov_forms": "dev-feature/1.x/42-drupal-10 as 1.0.0-beta1", "localgovdrupal/localgov_search": "^1.2" From df6031d3880d723b39a00e9d562851bafc72851e Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Thu, 21 Sep 2023 16:25:25 +0100 Subject: [PATCH 20/25] Fixing test failuers from GroupPermissionsHelper and the Group Permissions module --- composer.json | 3 +++ src/GroupPermissionsHelper.php | 3 +++ tests/src/Kernel/GroupPermissionsHelperTest.php | 5 ++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 07f17102..16636961 100644 --- a/composer.json +++ b/composer.json @@ -42,6 +42,9 @@ }, "drupal/ginvite": { "View schema fix #3324625": "https://www.drupal.org/files/issues/2022-11-30/3324625-2-schema-fix-for-4.0.x.patch" + }, + "drupal/group_permissions": { + "Access checking must be explicitly set on entity queries #3368882": "https://www.drupal.org/files/issues/2023-07-11/add_access_check_to_entity_query.patch" } } } diff --git a/src/GroupPermissionsHelper.php b/src/GroupPermissionsHelper.php index d4be5eb6..3105a460 100644 --- a/src/GroupPermissionsHelper.php +++ b/src/GroupPermissionsHelper.php @@ -96,6 +96,9 @@ public function moduleStatus($check_module, GroupInterface $group): string { if ($module == $check_module) { continue; } + if (!isset($role_permissions['group'])) { + continue; + } foreach ($role_permissions['group'] as $role => $permissions) { $shared_permissions[$role] = array_merge($shared_permissions[$role] ?? [], array_intersect($module_permissions['group'][$role], $permissions)); } diff --git a/tests/src/Kernel/GroupPermissionsHelperTest.php b/tests/src/Kernel/GroupPermissionsHelperTest.php index 010d770a..cee957f7 100644 --- a/tests/src/Kernel/GroupPermissionsHelperTest.php +++ b/tests/src/Kernel/GroupPermissionsHelperTest.php @@ -200,7 +200,10 @@ public function testAlteredGroupPermissions() { */ public function testModulesList() { $permissions_helper = $this->container->get('localgov_microsites_group.permissions_helper'); - $this->assertEquals(['localgov_microsites_events' => GroupPermissionsHelperInterface::ENABLED], $permissions_helper->modulesList($this->group)); + $this->assertEquals([ + 'localgov_microsites_events' => GroupPermissionsHelperInterface::ENABLED, + 'localgov_microsites_group' => GroupPermissionsHelperInterface::NOT_APPLICABLE, + ], $permissions_helper->modulesList($this->group)); } } From bd15e23255f41eb153cf15efe1476072f89098b3 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Thu, 21 Sep 2023 17:09:46 +0100 Subject: [PATCH 21/25] More test fixes --- .../DomainGroupSettings/ContentTypeSettings.php | 3 +++ tests/src/Functional/MicrositeCreationTest.php | 1 + tests/src/Functional/ModuleSettingsFormTest.php | 2 +- tests/src/Kernel/GroupDefaultContentTest.php | 13 +++++++++++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/Plugin/DomainGroupSettings/ContentTypeSettings.php b/src/Plugin/DomainGroupSettings/ContentTypeSettings.php index a44abda7..e51b2cc4 100644 --- a/src/Plugin/DomainGroupSettings/ContentTypeSettings.php +++ b/src/Plugin/DomainGroupSettings/ContentTypeSettings.php @@ -84,6 +84,9 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta $hide_descriptions = system_admin_compact_mode(); $this->group = $group; $module_permissions = $this->groupPermissionsHelper->modulesList($group); + $module_permissions = array_filter($module_permissions, function($status) { + return $status != GroupPermissionsHelperInterface::NOT_APPLICABLE; + }); if (empty($module_permissions)) { $form['empty'] = [ '#type' => 'markup', diff --git a/tests/src/Functional/MicrositeCreationTest.php b/tests/src/Functional/MicrositeCreationTest.php index 52c69a5b..3adaaa66 100644 --- a/tests/src/Functional/MicrositeCreationTest.php +++ b/tests/src/Functional/MicrositeCreationTest.php @@ -84,6 +84,7 @@ public function testMicrositeCreationForm() { $this->assertNotNull($domain); $group_ids = \Drupal::entityQuery('group') ->condition('label', $site_name, '=') + ->accessCheck(TRUE) ->execute(); $this->assertNotEmpty($group_ids); $group = \Drupal::entityTypeManager()->getStorage('group')->load(reset($group_ids)); diff --git a/tests/src/Functional/ModuleSettingsFormTest.php b/tests/src/Functional/ModuleSettingsFormTest.php index eaed9165..ee70ea3c 100644 --- a/tests/src/Functional/ModuleSettingsFormTest.php +++ b/tests/src/Functional/ModuleSettingsFormTest.php @@ -41,7 +41,7 @@ class ModuleSettingsFormTest extends BrowserTestBase { /** * {@inheritdoc} */ - protected $defaultTheme = 'classy'; + protected $defaultTheme = 'stark'; /** * Regular authenticated User for tests. diff --git a/tests/src/Kernel/GroupDefaultContentTest.php b/tests/src/Kernel/GroupDefaultContentTest.php index dde1103e..99441788 100644 --- a/tests/src/Kernel/GroupDefaultContentTest.php +++ b/tests/src/Kernel/GroupDefaultContentTest.php @@ -21,6 +21,8 @@ class GroupDefaultContentTest extends GroupKernelTestBase { */ public static $modules = [ 'domain', + 'domain_group', + 'domain_path', 'entity_reference_revisions', 'field_formatter_class', 'field_group', @@ -32,12 +34,21 @@ class GroupDefaultContentTest extends GroupKernelTestBase { 'groupmedia', 'group_content_menu', 'group_permissions', + 'layout_discovery', + 'layout_paragraphs', + 'layout_paragraphs_permissions', 'node', + 'override_node_options', 'paragraphs', + 'path_alias', 'replicate', + 'toolbar', + 'tour', + 'user', 'views', 'localgov_media', 'localgov_microsites_group', + 'localgov_sa11y', ]; /** @@ -61,6 +72,8 @@ protected function setUp(): void { $this->installConfig([ 'gnode', + 'override_node_options', + 'user', 'localgov_media', 'localgov_microsites_group', From f3f1a200d55ccbe9e770a38b2cbfd2a5ea71eb19 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Fri, 22 Sep 2023 15:00:03 +0100 Subject: [PATCH 22/25] Fixing tests --- .../tests/src/Kernel/GroupTermEntityReferenceTest.php | 5 ++++- .../localgov_microsites_news.module | 10 +--------- tests/src/Functional/MicrositeSitewideSearchTest.php | 8 +++++--- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/modules/localgov_microsites_group_term_ui/tests/src/Kernel/GroupTermEntityReferenceTest.php b/modules/localgov_microsites_group_term_ui/tests/src/Kernel/GroupTermEntityReferenceTest.php index 1fa8bc14..2f976f4a 100644 --- a/modules/localgov_microsites_group_term_ui/tests/src/Kernel/GroupTermEntityReferenceTest.php +++ b/modules/localgov_microsites_group_term_ui/tests/src/Kernel/GroupTermEntityReferenceTest.php @@ -41,7 +41,10 @@ protected function setUp(): void { $this->installEntitySchema('entity_test'); $this->installEntitySchema('taxonomy_term'); $this->installEntitySchema('user'); - $this->installConfig(['localgov_microsites_group_term_ui_test']); + $this->installConfig([ + 'user', + 'localgov_microsites_group_term_ui_test', + ]); } /** diff --git a/modules/localgov_microsites_news/localgov_microsites_news.module b/modules/localgov_microsites_news/localgov_microsites_news.module index 8f70496f..b796bd6c 100644 --- a/modules/localgov_microsites_news/localgov_microsites_news.module +++ b/modules/localgov_microsites_news/localgov_microsites_news.module @@ -2,7 +2,7 @@ /** * @file - * LocalGov Microsites Directories module file. + * LocalGov Microsites News module file. */ use Drupal\localgov_microsites_group\RolesHelper; @@ -12,14 +12,6 @@ use Drupal\localgov_microsites_group\RolesHelper; */ function localgov_microsites_news_localgov_microsites_roles_default() { return [ - 'global' => [ - RolesHelper::MICROSITES_CONTROLLER_ROLE => [ - 'view directory facets', - ], - RolesHelper::MICROSITES_EDITOR_ROLE => [ - 'view directory facets', - ], - ], 'group' => [ RolesHelper::GROUP_ADMIN_ROLE => [ 'access group_term overview', diff --git a/tests/src/Functional/MicrositeSitewideSearchTest.php b/tests/src/Functional/MicrositeSitewideSearchTest.php index 538b1b39..fc5d9b61 100644 --- a/tests/src/Functional/MicrositeSitewideSearchTest.php +++ b/tests/src/Functional/MicrositeSitewideSearchTest.php @@ -78,9 +78,11 @@ protected function setUp(): void { $this->domain2 = $domain_storage->load('group_' . $this->group2->id()); // Create some content. - $this->pages1[] = $this->createPage($this->group1); - $this->pages1[] = $this->createPage($this->group1); - $this->pages2[] = $this->createPage($this->group2); + $this->pages1 = [ + $this->createPage($this->group1), + $this->createPage($this->group1), + ]; + $this->pages2 = [$this->createPage($this->group2)]; // Index directory content. $index = Index::load('localgov_sitewide_search'); From 341e55cfd62dfd573df9f02aadb5bec28bd8a0e4 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Fri, 22 Sep 2023 16:29:18 +0100 Subject: [PATCH 23/25] Fixed failing localgov_microsites_group_term_ui tests #396 --- .../localgov_microsites_group_term_ui.module | 1 + .../config/install/group.role.default-member.yml | 5 ++--- .../config/install/group.type.default.yml | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/localgov_microsites_group_term_ui/localgov_microsites_group_term_ui.module b/modules/localgov_microsites_group_term_ui/localgov_microsites_group_term_ui.module index a48f56f0..c81d4da6 100644 --- a/modules/localgov_microsites_group_term_ui/localgov_microsites_group_term_ui.module +++ b/modules/localgov_microsites_group_term_ui/localgov_microsites_group_term_ui.module @@ -105,6 +105,7 @@ function localgov_microsites_group_term_ui_form_alter(&$form, FormStateInterface } // Add our submit handler. + $form['actions']['overview']['#access'] = TRUE; $form['actions']['overview']['#submit'][] = 'localgov_microsites_group_term_ui_submit_taxonomy_term_localgov_topic_form'; } diff --git a/modules/localgov_microsites_group_term_ui/tests/modules/localgov_microsites_group_term_ui_test/config/install/group.role.default-member.yml b/modules/localgov_microsites_group_term_ui/tests/modules/localgov_microsites_group_term_ui_test/config/install/group.role.default-member.yml index 83d3c78e..3023bc57 100644 --- a/modules/localgov_microsites_group_term_ui/tests/modules/localgov_microsites_group_term_ui_test/config/install/group.role.default-member.yml +++ b/modules/localgov_microsites_group_term_ui/tests/modules/localgov_microsites_group_term_ui_test/config/install/group.role.default-member.yml @@ -3,12 +3,11 @@ status: true dependencies: config: - group.type.default - - user.role.authenticated id: default-member label: Member weight: -100 admin: false -scope: insider -global_role: authenticated +scope: individual +global_role: null group_type: default permissions: { } diff --git a/modules/localgov_microsites_group_term_ui/tests/modules/localgov_microsites_group_term_ui_test/config/install/group.type.default.yml b/modules/localgov_microsites_group_term_ui/tests/modules/localgov_microsites_group_term_ui_test/config/install/group.type.default.yml index bdc3cc3b..75621536 100644 --- a/modules/localgov_microsites_group_term_ui/tests/modules/localgov_microsites_group_term_ui_test/config/install/group.type.default.yml +++ b/modules/localgov_microsites_group_term_ui/tests/modules/localgov_microsites_group_term_ui_test/config/install/group.type.default.yml @@ -7,4 +7,5 @@ description: '' new_revision: true creator_membership: true creator_wizard: false -creator_roles: { } +creator_roles: + - default-admin From 4b51e968d66e348caf4c060cbc6f6de3e4fae789 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Fri, 22 Sep 2023 16:43:15 +0100 Subject: [PATCH 24/25] Fixed coding standards --- src/Plugin/DomainGroupSettings/ContentTypeSettings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Plugin/DomainGroupSettings/ContentTypeSettings.php b/src/Plugin/DomainGroupSettings/ContentTypeSettings.php index e51b2cc4..88f5b7f3 100644 --- a/src/Plugin/DomainGroupSettings/ContentTypeSettings.php +++ b/src/Plugin/DomainGroupSettings/ContentTypeSettings.php @@ -84,7 +84,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta $hide_descriptions = system_admin_compact_mode(); $this->group = $group; $module_permissions = $this->groupPermissionsHelper->modulesList($group); - $module_permissions = array_filter($module_permissions, function($status) { + $module_permissions = array_filter($module_permissions, function ($status) { return $status != GroupPermissionsHelperInterface::NOT_APPLICABLE; }); if (empty($module_permissions)) { From ec28b06a2f8b6f6f208f9bf679cc64d8fce060e3 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Fri, 29 Sep 2023 13:52:18 +0100 Subject: [PATCH 25/25] Updated reference to LGD forms to use latest beta release --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 16636961..667d220e 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "drupal/role_delegation": "^1.2", "localgovdrupal/group_webform": "^1.0.0-beta2", "localgovdrupal/localgov_core": "^2.12", - "localgovdrupal/localgov_forms": "dev-feature/1.x/42-drupal-10 as 1.0.0-beta1", + "localgovdrupal/localgov_forms": "^1.0.0-beta2", "localgovdrupal/localgov_search": "^1.2" }, "require-dev": {