From 741dea2e15ad2835351c13df4f15c9970a9afca2 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Mon, 6 Oct 2014 16:24:11 -0500
Subject: [PATCH] oops: Fix bad merge for list properties as sub-fields
---
include/class.dynamic_forms.php | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/include/class.dynamic_forms.php b/include/class.dynamic_forms.php
index 59605162d..58f326c55 100644
--- a/include/class.dynamic_forms.php
+++ b/include/class.dynamic_forms.php
@@ -1132,10 +1132,13 @@ class SelectionField extends FormField {
}
function hasSubFields() {
- return true;
+ return $this->getList()->getForm();
}
function getSubFields() {
- return $this->getConfigurationForm()->getFields();
+ $form = $this->getList()->getForm();
+ if ($form)
+ return $form->getFields();
+ return array();
}
function toString($items) {
--
GitLab