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

Fix regression displaying errors on ticket form

parent 334461e1
Branches
Tags
No related merge requests found
......@@ -40,14 +40,18 @@ $info=($_POST && $errors)?Format::htmlchars($_POST):$info;
</tr>
<?php
if (!$thisclient) {
UserForm::getUserForm()->render(false, 'Your Information');
$uform = UserForm::getUserForm()->getForm($_POST);
if ($_POST) $uform->isValid();
$uform->render(false, 'Your Information');
}
else { ?>
<tr><td colspan="2"><hr /></td></tr>
<tr><td>Email:</td><td><?php echo $thisclient->getEmail(); ?></td></tr>
<tr><td>Client:</td><td><?php echo $thisclient->getName(); ?></td></tr>
<?php }
TicketForm::getInstance()->render(false); ?>
$tform = TicketForm::getInstance()->getForm($_POST);
if ($_POST) $tform->isValid();
$tform->render(false); ?>
</tbody>
<tbody id="dynamic-form">
<?php if ($form) {
......
......@@ -222,12 +222,14 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<?php
}
TicketForm::getInstance()->render(true);
$tform = TicketForm::getInstance()->getForm($_POST);
if ($_POST) $tform->isValid();
$tform->render(true);
?>
</tbody>
<tbody id="dynamic-form">
<?php
if ($form) $form->render(true);
if ($form) $form->getForm()->render(true);
?>
</tbody>
<tbody>
......
......@@ -471,20 +471,11 @@ if($_POST && !$errors):
break;
case 'open':
$ticket=null;
$interest=array('name','email','subject');
if ($topic=Topic::lookup($_POST['topicId'])) {
if ($form = DynamicForm::lookup($topic->ht['form_id'])) {
$form = $form->instanciate();
# Collect name, email, and subject address for banning and such
foreach ($form->getAnswers() as $answer) {
$fname = $answer->getField()->get('name');
if (in_array($fname, $interest))
# XXX: Assigning to _POST not considered great PHP
# coding style
$_POST[$fname] = $answer->getField()->getClean();
}
if (!$form->isValid())
$errors = array_merge($errors, $form->errors());
if (!$form->getForm()->isValid())
$errors = array_merge($errors, $form->getForm()->errors());
}
}
if(!$thisstaff || !$thisstaff->canCreateTickets()) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment