From 24df72bffffc73af7ce565d2128e7eadda4204e6 Mon Sep 17 00:00:00 2001
From: Liam Morland <lkmorlan@uwaterloo.ca>
Date: Fri, 13 May 2022 15:00:32 -0400
Subject: [PATCH] Issue #3280431: Create FillPdfForm::getDefaultEntityType()
---
src/Entity/FillPdfForm.php | 8 ++++++++
src/FillPdfFormInterface.php | 8 ++++++++
src/Form/FillPdfFormForm.php | 4 +---
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/Entity/FillPdfForm.php b/src/Entity/FillPdfForm.php
index 7b5acf4..7215aef 100644
--- a/src/Entity/FillPdfForm.php
+++ b/src/Entity/FillPdfForm.php
@@ -222,6 +222,14 @@ class FillPdfForm extends ContentEntityBase implements FillPdfFormInterface {
}
}
+ /**
+ * {@inheritdoc}
+ */
+ public function getDefaultEntityType(): ?string {
+ $default_entity_type = $this->get('default_entity_type');
+ return count($default_entity_type) ? $default_entity_type->first()->value : NULL;
+ }
+
/**
* {@inheritdoc}
*/
diff --git a/src/FillPdfFormInterface.php b/src/FillPdfFormInterface.php
index 42f4382..7e4cfea 100644
--- a/src/FillPdfFormInterface.php
+++ b/src/FillPdfFormInterface.php
@@ -9,6 +9,14 @@ namespace Drupal\fillpdf;
*/
interface FillPdfFormInterface extends ExportableContentEntityInterface {
+ /**
+ * Returns the default entity type ID for this FillPdfForm.
+ *
+ * @return string|null
+ * The entity type ID or NULL if there is none set.
+ */
+ public function getDefaultEntityType(): ?string;
+
/**
* Returns all FillPdfFormFields associated with this FillPdfForm.
*
diff --git a/src/Form/FillPdfFormForm.php b/src/Form/FillPdfFormForm.php
index 84c467a..aaab5e5 100644
--- a/src/Form/FillPdfFormForm.php
+++ b/src/Form/FillPdfFormForm.php
@@ -147,9 +147,7 @@ class FillPdfFormForm extends ContentEntityForm {
$form['title']['token_tree'] = $this->adminFormHelper->getAdminTokenForm();
- // @todo Encapsulate this logic into a ::getDefaultEntityType() method on FillPdfForm
- $stored_default_entity_type = $fillpdf_form->get('default_entity_type');
- $default_entity_type = count($stored_default_entity_type) ? $stored_default_entity_type->first()->value : NULL;
+ $default_entity_type = $fillpdf_form->getDefaultEntityType();
$form['default_entity_type'] = [
'#type' => 'select',
--
GitLab