Fix regression saving ticket priority

include/class.dynamic_forms.php

@@ -356,6 +356,7 @@ class DynamicFormEntry extends VerySimpleModel {
     function setAnswer($name, $value, $id=false) {
         foreach ($this->getAnswers() as $ans) {
             if ($ans->getField()->get('name') == $name) {
+                $ans->getField()->reset();
                 $ans->set('value', $value);
                 if ($id !== false)
                     $ans->set('value_id', $id);
@@ -523,6 +524,7 @@ class DynamicFormEntry extends VerySimpleModel {
             $a = DynamicFormEntryAnswer::create(
                 array('field_id'=>$f->get('id')));
             $a->field = $f;
+            $a->field->setAnswer($a);
             $inst->_values[] = $a;
         }
         return $inst;
@@ -569,7 +571,7 @@ class DynamicFormEntryAnswer extends VerySimpleModel {
         if (!isset($this->field)) {
             $f = DynamicFormField::lookup($this->get('field_id'));
             $this->field = $f->getImpl($f);
-            $this->field->answer = $this;
+            $this->field->setAnswer($this);
         }
         return $this->field;
     }

include/class.forms.php

@@ -116,6 +116,7 @@ class FormField {
     var $_clean;
     var $_errors = array();
     var $_widget;
+    var $answer;
     var $parent;
     var $presentation_only = false;
 
@@ -179,6 +180,9 @@ class FormField {
         }
         return $this->_clean;
     }
+    function reset() {
+        $this->_clean = $this->_widget = null;
+    }
 
     function errors() {
         return $this->_errors;
@@ -312,6 +316,7 @@ class FormField {
     }
 
     function getAnswer() { return $this->answer; }
+    function setAnswer($ans) { $this->answer = $ans; }
 
     function getFormName() {
         if (is_numeric($this->get('id')))

include/class.ticket.php

@@ -2028,7 +2028,7 @@ class Ticket {
         // Intenal mapping magic...see if we need to override anything
         if(isset($vars['topicId']) && ($topic=Topic::lookup($vars['topicId']))) { //Ticket created via web by user/or staff
             $deptId=$deptId?$deptId:$topic->getDeptId();
-            if (!$form->getAnswer('priority'))
+            if (!$form->getAnswer('priority')->getIdValue())
                 $form->setAnswer('priority', null, $topic->getPriorityId());
             if($autorespond) $autorespond=$topic->autoRespond();
             $source=$vars['source']?$vars['source']:'Web';
@@ -2047,14 +2047,14 @@ class Ticket {
 
         }elseif($vars['emailId'] && !$vars['deptId'] && ($email=Email::lookup($vars['emailId']))) { //Emailed Tickets
             $deptId=$email->getDeptId();
-            if (!$form->getAnswer('priority'))
+            if (!$form->getAnswer('priority')->getIdValue())
                 $form->setAnswer('priority', null, $email->getPriorityId());
             if($autorespond) $autorespond=$email->autoRespond();
             $email=null;
             $source='Email';
         }
         //Last minute checks
-        if (!$form->getAnswer('priority'))
+        if (!$form->getAnswer('priority')->getIdValue())
             $form->setAnswer('priority', null, $cfg->getDefaultPriorityId());
         $deptId=$deptId?$deptId:$cfg->getDefaultDeptId();
         $topicId=$vars['topicId']?$vars['topicId']:0;