From a3e7383940263b175d134c16cfe7c09d9f2ca370 Mon Sep 17 00:00:00 2001 From: aydreeihn <adriane@enhancesoft.com> Date: Mon, 19 Mar 2018 16:46:08 -0500 Subject: [PATCH] hide fields disabled by help topic in ticket view --- include/staff/ticket-view.inc.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php index 6b8fe9791..c31d94660 100644 --- a/include/staff/ticket-view.inc.php +++ b/include/staff/ticket-view.inc.php @@ -576,13 +576,17 @@ if($ticket->isOverdue()) <br> <?php foreach (DynamicFormEntry::forTicket($ticket->getId()) as $form) { + //Find fields to exclude if disabled by help topic + $disabled = Ticket::getMissingRequiredFields($ticket, true); + // Skip core fields shown earlier in the ticket view // TODO: Rewrite getAnswers() so that one could write // ->getAnswers()->filter(not(array('field__name__in'=> // array('email', ...)))); $answers = $form->getAnswers()->exclude(Q::any(array( 'field__flags__hasbit' => DynamicFormField::FLAG_EXT_STORED, - 'field__name__in' => array('subject', 'priority') + 'field__name__in' => array('subject', 'priority'), + 'field__id__in' => $disabled, ))); $displayed = array(); foreach($answers as $a) { -- GitLab