Merge pull request #935 from protich/issue/934

Show properties config button if the form exists

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

include/class.dynamic_forms.php

@@ -916,6 +916,10 @@ class DynamicList extends VerySimpleModel {
         return $this->_form;
     }
 
+    function getForm() {
+        return $this->getConfigurationForm();
+    }
+
     function save($refetch=false) {
         if (count($this->dirty))
             $this->set('updated', new SqlFunction('NOW'));

include/staff/dynamic-list.inc.php

@@ -220,7 +220,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                 value="<?php echo $i->get('sort'); ?>"/></td>
             <td><input type="text" size="40" name="value-<?php echo $id; ?>"
                 value="<?php echo $i->get('value'); ?>"/>
-                <?php if ($form->getFields()) { ?>
+                <?php if ($form && $form->getFields()) { ?>
                 <a class="action-button" style="float:none;overflow:inherit"
                     href="#ajax.php/list/item/<?php
                         echo $i->get('id'); ?>/properties"

scp/lists.php

@@ -6,9 +6,8 @@ $list=null;
 if($_REQUEST['id'] && !($list=DynamicList::lookup($_REQUEST['id'])))
     $errors['err']='Unknown or invalid dynamic list ID.';
 
-if ($list) {
-    $form = DynamicForm::lookup(array('type'=>'L'.$_REQUEST['id']));
-}
+if ($list)
+    $form = $list->getForm();
 
 if($_POST) {
     $fields = array('name', 'name_plural', 'sort_mode', 'notes');