From ad34072ccd326cfd7905f325c2ff27084ee0fdd2 Mon Sep 17 00:00:00 2001
From: JediKev <kevin@enhancesoft.com>
Date: Wed, 10 May 2017 21:50:17 -0500
Subject: [PATCH] forms: Proper Field Deletion
This addresses issue where upon deletion of a form field and all its
entry values, the field record wouldn't be deleted from the `form_field`
table. This links another issue where you can't delete a list if its
been a field before. This is due to the list delete() function that
checks for list field records in the `form_field` table.
---
include/class.dynamic_forms.php | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/include/class.dynamic_forms.php b/include/class.dynamic_forms.php
index 9abe6467a..ccbbfd220 100644
--- a/include/class.dynamic_forms.php
+++ b/include/class.dynamic_forms.php
@@ -556,6 +556,9 @@ class DynamicFormField extends VerySimpleModel {
'null' => true,
'constraint' => array('form_id' => 'DynamicForm.id'),
),
+ 'answers' => array(
+ 'reverse' => 'DynamicFormEntryAnswer.field',
+ ),
),
);
@@ -864,6 +867,8 @@ class DynamicFormField extends VerySimpleModel {
}
function delete() {
+ $values = $this->answers->count();
+
// Don't really delete form fields with data as that will screw up the data
// model. Instead, just drop the association with the form which
// will give the appearance of deletion. Not deleting means that
@@ -878,7 +883,7 @@ class DynamicFormField extends VerySimpleModel {
$impl->db_cleanup(true);
// Short-circuit deletion if the field has data.
- if ($impl->hasData())
+ if ($impl->hasData() && $values)
return $this->save();
// Delete the field for realz
--
GitLab