Merge branch '12.x'

2020-11-23 20:42:59 +08:00
parent 6ce3a0345b a6b21d74b7
commit b42d47e257
230 changed files with 5568 additions and 1943 deletions
@@ -24,6 +24,12 @@
        <?php include '../../common/view/customfield.html.php';?>
      </div>
    </div>
+    <?php
+    foreach(explode(',', $config->task->create->requiredFields) as $field)
+    {
+        if($field and strpos($showFields, $field) === false) $showFields .= ',' . $field;
+    }
+    ?>
    <form class='main-form form-ajax' method='post' enctype='multipart/form-data' id='dataform'>
      <table class='table table-form'>
        <tr>