From 8f3fe8ce03ad399cccea3625f71137275c25a2a0 Mon Sep 17 00:00:00 2001
From: Aaron Bauman <aaron@messageagency.com>
Date: Tue, 18 Mar 2025 13:16:17 -0400
Subject: [PATCH] Issue #3506472 by scambler: Record type filter cleared
whenever saving mapping fields
---
.../src/Form/SalesforceMappingFormBase.php | 17 -----------------
.../src/Form/SalesforceMappingFormCrudBase.php | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/modules/salesforce_mapping_ui/src/Form/SalesforceMappingFormBase.php b/modules/salesforce_mapping_ui/src/Form/SalesforceMappingFormBase.php
index 4c1d7ddc..6ee4288a 100644
--- a/modules/salesforce_mapping_ui/src/Form/SalesforceMappingFormBase.php
+++ b/modules/salesforce_mapping_ui/src/Form/SalesforceMappingFormBase.php
@@ -182,21 +182,4 @@ abstract class SalesforceMappingFormBase extends EntityForm {
return $sfobject_options;
}
- /**
- * {@inheritdoc}
- */
- public function buildEntity(array $form, FormStateInterface $form_state) {
- $entity = parent::buildEntity($form, $form_state);
- $record_types = $form_state->getValue('pull_record_type_filter');
- if (!empty($record_types)) {
- $record_types = array_filter($record_types);
- if (!empty($record_types)) {
- $record_types = array_values($record_types);
- }
- }
- $entity->set('pull_record_type_filter', $record_types ?? []);
- return $entity;
- }
-
-
}
diff --git a/modules/salesforce_mapping_ui/src/Form/SalesforceMappingFormCrudBase.php b/modules/salesforce_mapping_ui/src/Form/SalesforceMappingFormCrudBase.php
index e36c6bb2..89c4f885 100644
--- a/modules/salesforce_mapping_ui/src/Form/SalesforceMappingFormCrudBase.php
+++ b/modules/salesforce_mapping_ui/src/Form/SalesforceMappingFormCrudBase.php
@@ -605,4 +605,20 @@ abstract class SalesforceMappingFormCrudBase extends SalesforceMappingFormBase {
return $options;
}
+ /**
+ * {@inheritdoc}
+ */
+ public function buildEntity(array $form, FormStateInterface $form_state) {
+ $entity = parent::buildEntity($form, $form_state);
+ $record_types = $form_state->getValue('pull_record_type_filter');
+ if (!empty($record_types)) {
+ $record_types = array_filter($record_types);
+ if (!empty($record_types)) {
+ $record_types = array_values($record_types);
+ }
+ }
+ $entity->set('pull_record_type_filter', $record_types ?? []);
+ return $entity;
+ }
+
}
--
GitLab