From c8301bc2e3d4ea4f811742ff309b11794b8e3c99 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Mon, 25 Aug 2014 22:13:15 -0500
Subject: [PATCH] forms: Fix display of some validation errors
---
include/class.dynamic_forms.php | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/include/class.dynamic_forms.php b/include/class.dynamic_forms.php
index bb95d76b3..74b6ef4f3 100644
--- a/include/class.dynamic_forms.php
+++ b/include/class.dynamic_forms.php
@@ -696,9 +696,14 @@ class DynamicFormEntry extends VerySimpleModel {
function forTicket($ticket_id, $force=false) {
static $entries = array();
- if (!isset($entries[$ticket_id]) || $force)
- $entries[$ticket_id] = DynamicFormEntry::objects()
+ if (!isset($entries[$ticket_id]) || $force) {
+ $stuff = DynamicFormEntry::objects()
->filter(array('object_id'=>$ticket_id, 'object_type'=>'T'));
+ // If forced, don't cache the result
+ if ($force)
+ return $stuff;
+ $entries[$ticket_id] = &$stuff;
+ }
return $entries[$ticket_id];
}
function setTicketId($ticket_id) {
@@ -747,7 +752,7 @@ class DynamicFormEntry extends VerySimpleModel {
foreach ($this->getAnswers() as $answer)
$answer->deleted = true;
- foreach ($this->getForm()->getDynamicFields() as $field) {
+ foreach ($this->getFields() as $field) {
$found = false;
foreach ($this->getAnswers() as $answer) {
if ($answer->get('field_id') == $field->get('id')) {
--
GitLab