Skip to content
Snippets Groups Projects
Commit e5e1cee5 authored by Liam Morland's avatar Liam Morland Committed by Kevin Paxman
Browse files

ISTWCMS-4960: Use #access to remove parts of forms instead of unsetting them

Unsetting can cause empty value to be stored instead of non-empty
default values.

Fixes issues introduced in f16d00b8, 2ae5f344, 8460840b, and 713810bd.
parent 0b6c7cbd
No related branches found
No related tags found
1 merge request!134ISTWCMS-4960: Use #access to remove parts of forms instead of unsetting them
...@@ -109,7 +109,7 @@ function uw_cfg_common_form_layout_builder_configure_section_alter(array &$form, ...@@ -109,7 +109,7 @@ function uw_cfg_common_form_layout_builder_configure_section_alter(array &$form,
*/ */
function uw_cfg_common_form_webform_admin_config_submissions_form_alter(array &$form, FormStateInterface $form_state, string $form_id): void { function uw_cfg_common_form_webform_admin_config_submissions_form_alter(array &$form, FormStateInterface $form_state, string $form_id): void {
// Remove undesired features. // Remove undesired features.
unset($form['views_settings']); $form['views_settings']['#access'] = FALSE;
} }
/** /**
...@@ -127,7 +127,7 @@ function uw_cfg_common_form_webform_settings_access_form_alter(array &$form, For ...@@ -127,7 +127,7 @@ function uw_cfg_common_form_webform_settings_access_form_alter(array &$form, For
'configuration', 'configuration',
]; ];
foreach ($sections_to_remove as $section) { foreach ($sections_to_remove as $section) {
unset($form['access'][$section]); $form['access'][$section]['#access'] = FALSE;
} }
// Remove all but user-based access for submissions and test. // Remove all but user-based access for submissions and test.
...@@ -145,7 +145,7 @@ function uw_cfg_common_form_webform_settings_access_form_alter(array &$form, For ...@@ -145,7 +145,7 @@ function uw_cfg_common_form_webform_settings_access_form_alter(array &$form, For
]; ];
foreach ($permissions_to_edit as $permission) { foreach ($permissions_to_edit as $permission) {
foreach ($access_types_to_remove as $type) { foreach ($access_types_to_remove as $type) {
unset($form['access'][$permission][$type]); $form['access'][$permission][$type]['#access'] = FALSE;
} }
} }
} }
...@@ -165,8 +165,8 @@ function uw_cfg_common_form_webform_settings_confirmation_form_alter(array &$for ...@@ -165,8 +165,8 @@ function uw_cfg_common_form_webform_settings_confirmation_form_alter(array &$for
unset($form['confirmation_type']['confirmation_type']['#options']['none']); unset($form['confirmation_type']['confirmation_type']['#options']['none']);
// Remove undesired features. // Remove undesired features.
unset($form['confirmation_attributes_container']); $form['confirmation_attributes_container']['#access'] = FALSE;
unset($form['back']['back_container']['confirmation_back_attributes_container']); $form['back']['back_container']['confirmation_back_attributes_container']['#access'] = FALSE;
} }
/** /**
...@@ -176,7 +176,7 @@ function uw_cfg_common_form_webform_settings_confirmation_form_alter(array &$for ...@@ -176,7 +176,7 @@ function uw_cfg_common_form_webform_settings_confirmation_form_alter(array &$for
*/ */
function uw_cfg_common_form_webform_settings_form_alter(array &$form, FormStateInterface $form_state, string $form_id): void { function uw_cfg_common_form_webform_settings_form_alter(array &$form, FormStateInterface $form_state, string $form_id): void {
// Remove undesired features. // Remove undesired features.
unset($form['ajax_settings']); $form['ajax_settings']['#access'] = FALSE;
} }
/** /**
...@@ -186,20 +186,20 @@ function uw_cfg_common_form_webform_settings_form_alter(array &$form, FormStateI ...@@ -186,20 +186,20 @@ function uw_cfg_common_form_webform_settings_form_alter(array &$form, FormStateI
*/ */
function uw_cfg_common_form_webform_settings_form_form_alter(array &$form, FormStateInterface $form_state, string $form_id): void { function uw_cfg_common_form_webform_settings_form_form_alter(array &$form, FormStateInterface $form_state, string $form_id): void {
// Unset the source entity settings in webforms. // Unset the source entity settings in webforms.
unset($form['form_behaviors']['form_prepopulate_source_entity']); $form['form_behaviors']['form_prepopulate_source_entity']['#access'] = FALSE;
unset($form['form_behaviors']['form_prepopulate_source_entity_required']); $form['form_behaviors']['form_prepopulate_source_entity_required']['#access'] = FALSE;
unset($form['form_behaviors']['form_prepopulate_source_entity_type']); $form['form_behaviors']['form_prepopulate_source_entity_type']['#access'] = FALSE;
// Remove undesired features. // Remove undesired features.
unset($form['access_denied']); $form['access_denied']['#access'] = FALSE;
unset($form['custom_settings']); $form['custom_settings']['#access'] = FALSE;
unset($form['form_behaviors']['form_autofocus']); $form['form_behaviors']['form_autofocus']['#access'] = FALSE;
unset($form['form_behaviors']['form_disable_back']); $form['form_behaviors']['form_disable_back']['#access'] = FALSE;
unset($form['form_behaviors']['form_novalidate']); $form['form_behaviors']['form_novalidate']['#access'] = FALSE;
unset($form['form_behaviors']['form_required']); $form['form_behaviors']['form_required']['#access'] = FALSE;
unset($form['form_behaviors']['form_reset']); $form['form_behaviors']['form_reset']['#access'] = FALSE;
unset($form['form_behaviors']['form_submit_back']); $form['form_behaviors']['form_submit_back']['#access'] = FALSE;
unset($form['form_settings']['form_attributes']); $form['form_settings']['form_attributes']['#access'] = FALSE;
} }
/** /**
...@@ -209,11 +209,11 @@ function uw_cfg_common_form_webform_settings_form_form_alter(array &$form, FormS ...@@ -209,11 +209,11 @@ function uw_cfg_common_form_webform_settings_form_form_alter(array &$form, FormS
*/ */
function uw_cfg_common_form_webform_settings_submissions_form_alter(array &$form, FormStateInterface $form_state, string $form_id): void { function uw_cfg_common_form_webform_settings_submissions_form_alter(array &$form, FormStateInterface $form_state, string $form_id): void {
// Remove undesired features. // Remove undesired features.
unset($form['access_denied']); $form['access_denied']['#access'] = FALSE;
unset($form['submission_behaviors']['form_convert_anonymous']); $form['submission_behaviors']['form_convert_anonymous']['#access'] = FALSE;
unset($form['submission_behaviors']['submission_log']); $form['submission_behaviors']['submission_log']['#access'] = FALSE;
unset($form['submission_behaviors']['token_update']); $form['submission_behaviors']['token_update']['#access'] = FALSE;
unset($form['views_settings']); $form['views_settings']['#access'] = FALSE;
} }
/** /**
...@@ -520,8 +520,8 @@ function uw_cfg_common_form_alter(array &$form, FormStateInterface $form_state, ...@@ -520,8 +520,8 @@ function uw_cfg_common_form_alter(array &$form, FormStateInterface $form_state,
// ISTWCMS-4648: removing revisions from layout builder page. // ISTWCMS-4648: removing revisions from layout builder page.
if (\Drupal::routeMatch()->getRouteName() == 'layout_builder.overrides.node.view') { if (\Drupal::routeMatch()->getRouteName() == 'layout_builder.overrides.node.view') {
unset($form['revision']); $form['revision']['#access'] = FALSE;
unset($form['advanced']); $form['advanced']['#access'] = FALSE;
} }
// Ensure that we are on a UW content type node. // Ensure that we are on a UW content type node.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment