Skip to content
Snippets Groups Projects
Commit c8301bc2 authored by Jared Hancock's avatar Jared Hancock
Browse files

forms: Fix display of some validation errors

parent 157b3d96
No related branches found
No related tags found
No related merge requests found
...@@ -696,9 +696,14 @@ class DynamicFormEntry extends VerySimpleModel { ...@@ -696,9 +696,14 @@ class DynamicFormEntry extends VerySimpleModel {
function forTicket($ticket_id, $force=false) { function forTicket($ticket_id, $force=false) {
static $entries = array(); static $entries = array();
if (!isset($entries[$ticket_id]) || $force) if (!isset($entries[$ticket_id]) || $force) {
$entries[$ticket_id] = DynamicFormEntry::objects() $stuff = DynamicFormEntry::objects()
->filter(array('object_id'=>$ticket_id, 'object_type'=>'T')); ->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]; return $entries[$ticket_id];
} }
function setTicketId($ticket_id) { function setTicketId($ticket_id) {
...@@ -747,7 +752,7 @@ class DynamicFormEntry extends VerySimpleModel { ...@@ -747,7 +752,7 @@ class DynamicFormEntry extends VerySimpleModel {
foreach ($this->getAnswers() as $answer) foreach ($this->getAnswers() as $answer)
$answer->deleted = true; $answer->deleted = true;
foreach ($this->getForm()->getDynamicFields() as $field) { foreach ($this->getFields() as $field) {
$found = false; $found = false;
foreach ($this->getAnswers() as $answer) { foreach ($this->getAnswers() as $answer) {
if ($answer->get('field_id') == $field->get('id')) { if ($answer->get('field_id') == $field->get('id')) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment