From 551acd6ddbb412062968de6a47dae4a4b7c0cfbe Mon Sep 17 00:00:00 2001
From: liugang <liugang@cnezsoft.com>
Date: Fri, 9 Aug 2019 17:35:34 +0800
Subject: [PATCH] * Optimize.

---
 module/product/view/edit.html.php     | 2 +-
 module/productplan/view/edit.html.php | 2 +-
 module/release/model.php              | 2 +-
 module/release/view/edit.html.php     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php
index b8a6b4d35c..572d8b9935 100644
--- a/module/product/view/edit.html.php
+++ b/module/product/view/edit.html.php
@@ -58,11 +58,11 @@
             <th><?php echo $lang->product->status;?></th>
             <td><?php echo html::select('status', $lang->product->statusList, $product->status, "class='form-control'");?></td><td></td>
           </tr>  
+          <?php $this->printExtendFields($product, 'table', 'columns=1');?>
           <tr>
             <th><?php echo $lang->product->desc;?></th>
             <td colspan='2'><?php echo html::textarea('desc', htmlspecialchars($product->desc), "rows='8' class='form-control'");?></td>
           </tr>  
-          <?php $this->printExtendFields($product, 'table', 'columns=1');?>
           <tr>
             <th><?php echo $lang->product->acl;?></th>
             <td colspan='2'><?php echo nl2br(html::radio('acl', $lang->product->aclList, $product->acl, "onclick='setWhite(this.value);'", 'block'));?></td>
diff --git a/module/productplan/view/edit.html.php b/module/productplan/view/edit.html.php
index a8708a0391..3a22833ff6 100644
--- a/module/productplan/view/edit.html.php
+++ b/module/productplan/view/edit.html.php
@@ -52,11 +52,11 @@
             <td><?php echo html::input('end', $plan->end != '2030-01-01' ? formatTime($plan->end) : '', 'class="form-control form-date"');?></td>
             <td colspan='2'><?php echo html::radio('delta', $lang->productplan->endList , '', "onclick='computeEndDate(this.value)'");?></td>
           </tr>
+          <?php $this->printExtendFields($plan, 'table', 'columns=1');?>
           <tr>
             <th><?php echo $lang->productplan->desc;?></th>
             <td colspan='3'><?php echo html::textarea('desc', htmlspecialchars($plan->desc), "rows='10' class='form-control kindeditor' hidefocus='true'");?></td>
           </tr>
-          <?php $this->printExtendFields($plan, 'table', 'columns=3');?>
           <tr>
             <td colspan='4' class='text-center form-actions'>
               <?php echo html::submitButton();?>
diff --git a/module/release/model.php b/module/release/model.php
index 1162d939dd..a11b44f7dd 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -130,7 +130,7 @@ class releaseModel extends model
                     ->add('builder', $this->app->user->account)
                     ->add('branch', $branch)
                     ->stripTags($this->config->release->editor->create['id'], $this->config->allowedTags)
-                    ->remove('marker,build,files,labels,uid')
+                    ->remove('marker,build,files,labels,uid,subStatus') // There is the subStatus field in the biz version.
                     ->get();
                 $build = $this->loadModel('file')->processImgURL($build, $this->config->release->editor->create['id']);
                 $this->dao->insert(TABLE_BUILD)->data($build)
diff --git a/module/release/view/edit.html.php b/module/release/view/edit.html.php
index c256264445..d35affc5ed 100644
--- a/module/release/view/edit.html.php
+++ b/module/release/view/edit.html.php
@@ -47,11 +47,11 @@
             <th><?php echo $lang->release->status;?></th>
             <td><?php echo html::select('status', $lang->release->statusList, $release->status, "class='form-control'");?></td><td></td>
           </tr>  
+          <?php $this->printExtendFields($release, 'table', 'columns=1');?>
           <tr>
             <th><?php echo $lang->release->desc;?></th>
             <td colspan='2'><?php echo html::textarea('desc', htmlspecialchars($release->desc), "rows=10 class='form-control kindeditor' hidefocus='true'");?></td>
           </tr>  
-          <?php $this->printExtendFields($release, 'table', 'columns=2');?>
           <tr>
             <th><?php echo $lang->files;?></th>
             <td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>