Merge pull request #1793 from protich/issue/list-delete

forms: Add ability to delete properties form

Reviewed-By: Jared Hancock <jared@osticket.com>

include/class.dynamic_forms.php

@@ -189,9 +189,11 @@ class DynamicForm extends VerySimpleModel {
     }
 
     function delete() {
+
         if (!$this->isDeletable())
             return false;
 
+        // Soft Delete: Mark the form as deleted.
         $this->setFlag(self::FLAG_DELETED);
         return $this->save();
     }

include/class.list.php

@@ -355,11 +355,20 @@ class DynamicList extends VerySimpleModel implements CustomList {
     function delete() {
         $fields = DynamicFormField::objects()->filter(array(
             'type'=>'list-'.$this->id))->count();
-        if ($fields == 0)
-            return parent::delete();
-        else
-            // Refuse to delete lists that are in use by fields
+
+        // Refuse to delete lists that are in use by fields
+        if ($fields != 0)
+            return false;
+
+        if (!parent::delete())
             return false;
+
+        if (($form = $this->getForm(false))) {
+            $form->delete(false);
+            $form->fields->delete();
+        }
+
+        return true;
     }
 
     private function createForm() {