From ff55e2267fe18ae2f4d89ceb7e796b51adb5e5ce Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 24 Jul 2019 13:44:01 +0800
Subject: [PATCH]  * add printExtendFields method.

---
 framework/control.class.php             | 15 +++++++++++++++
 module/bug/view/activate.html.php       |  2 +-
 module/bug/view/assignto.html.php       |  2 +-
 module/bug/view/close.html.php          |  2 +-
 module/bug/view/confirmbug.html.php     |  2 +-
 module/bug/view/create.html.php         |  2 +-
 module/bug/view/edit.html.php           |  4 ++--
 module/bug/view/resolve.html.php        |  2 +-
 module/bug/view/view.html.php           |  4 ++--
 module/build/view/create.html.php       |  2 +-
 module/build/view/edit.html.php         |  2 +-
 module/build/view/view.html.php         |  2 +-
 module/product/view/close.html.php      |  2 +-
 module/product/view/create.html.php     |  2 +-
 module/product/view/edit.html.php       |  2 +-
 module/product/view/view.html.php       |  4 ++--
 module/productplan/view/create.html.php |  2 +-
 module/productplan/view/edit.html.php   |  2 +-
 module/productplan/view/view.html.php   |  2 +-
 module/project/view/activate.html.php   |  2 +-
 module/project/view/close.html.php      |  2 +-
 module/project/view/create.html.php     |  2 +-
 module/project/view/edit.html.php       |  2 +-
 module/project/view/putoff.html.php     |  2 +-
 module/project/view/start.html.php      |  2 +-
 module/project/view/suspend.html.php    |  2 +-
 module/project/view/view.html.php       |  4 ++--
 module/release/view/create.html.php     |  2 +-
 module/release/view/edit.html.php       |  2 +-
 module/release/view/view.html.php       |  2 +-
 module/story/view/activate.html.php     |  2 +-
 module/story/view/assignto.html.php     |  2 +-
 module/story/view/change.html.php       |  2 +-
 module/story/view/close.html.php        |  2 +-
 module/story/view/create.html.php       |  2 +-
 module/story/view/edit.html.php         |  4 ++--
 module/story/view/review.html.php       |  2 +-
 module/story/view/view.html.php         |  4 ++--
 module/task/view/activate.html.php      |  2 +-
 module/task/view/assignto.html.php      |  2 +-
 module/task/view/cancel.html.php        |  2 +-
 module/task/view/close.html.php         |  2 +-
 module/task/view/create.html.php        |  2 +-
 module/task/view/edit.html.php          |  2 +-
 module/task/view/finish.html.php        |  2 +-
 module/task/view/pause.html.php         |  2 +-
 module/task/view/start.html.php         |  2 +-
 module/task/view/view.html.php          |  4 ++--
 module/testcase/view/create.html.php    |  2 +-
 module/testcase/view/edit.html.php      |  2 +-
 module/testcase/view/review.html.php    |  2 +-
 module/testcase/view/view.html.php      |  4 ++--
 module/testsuite/view/create.html.php   |  2 +-
 module/testsuite/view/edit.html.php     |  2 +-
 module/testsuite/view/view.html.php     |  2 +-
 module/testtask/view/activate.html.php  |  2 +-
 module/testtask/view/block.html.php     |  2 +-
 module/testtask/view/close.html.php     |  2 +-
 module/testtask/view/create.html.php    |  2 +-
 module/testtask/view/edit.html.php      |  2 +-
 module/testtask/view/start.html.php     |  2 +-
 module/testtask/view/view.html.php      |  4 ++--
 62 files changed, 85 insertions(+), 70 deletions(-)

diff --git a/framework/control.class.php b/framework/control.class.php
index 9b9d950b35..1d36c354e9 100644
--- a/framework/control.class.php
+++ b/framework/control.class.php
@@ -215,4 +215,19 @@ class control extends baseControl
             if($flow && $action) $this->loadModel('workflowhook')->execute($flow, $action, $objectID);
         }
     }
+
+    /**
+     * Print extend fields.
+     *
+     * @param  object $object
+     * @param  string $type
+     * @param  string $extras
+     * @access public
+     * @return void
+     */
+    public function printExtendFields($object, $type, $extras)
+    {
+        if(!isset($this->config->bizVersion)) return false;
+        $this->loadModel('flow')->printFields($this->moduleName, $this->methodName, $object, $type, $extras);
+    }
 }
diff --git a/module/bug/view/activate.html.php b/module/bug/view/activate.html.php
index 532def28e0..51b56bc2f6 100644
--- a/module/bug/view/activate.html.php
+++ b/module/bug/view/activate.html.php
@@ -34,7 +34,7 @@
           <th><?php echo $lang->bug->openedBuild;?></th>
           <td colspan='2'><?php echo html::select('openedBuild[]', $builds, $bug->openedBuild, 'size=4 multiple=multiple class="form-control chosen"');?></td>
         </tr>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $bug, 'table', 'columns=2');?>
+        <?php $this->printExtendFields($bug, 'table', 'columns=2');?>
         <tr>
           <th><?php echo $lang->comment;?></th>
           <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
diff --git a/module/bug/view/assignto.html.php b/module/bug/view/assignto.html.php
index 1c4036756b..47ee363e0f 100644
--- a/module/bug/view/assignto.html.php
+++ b/module/bug/view/assignto.html.php
@@ -38,7 +38,7 @@ js::set('page', 'assignedto');
           <th><?php echo $lang->bug->mailto;?></th>
           <td colspan='2'><?php echo html::select('mailto[]', $users, str_replace(' ', '', $bug->mailto), 'class="form-control chosen" multiple');?></td>
         </tr>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $bug, 'table', 'columns=2');?>
+        <?php $this->printExtendFields($bug, 'table', 'columns=2');?>
         <tr>
           <th><?php echo $lang->comment;?></th>
           <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
diff --git a/module/bug/view/close.html.php b/module/bug/view/close.html.php
index f431fc96a0..18d796dd68 100644
--- a/module/bug/view/close.html.php
+++ b/module/bug/view/close.html.php
@@ -26,7 +26,7 @@
     </div>
     <form method='post' target='hiddenwin'>
       <table class='table table-form'>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $bug, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($bug, 'table', 'columns=1');?>
         <tr>
           <th class='w-60px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
diff --git a/module/bug/view/confirmbug.html.php b/module/bug/view/confirmbug.html.php
index dc154a955d..ce927a4cda 100755
--- a/module/bug/view/confirmbug.html.php
+++ b/module/bug/view/confirmbug.html.php
@@ -49,7 +49,7 @@ js::set('page', 'confirmbug');
           <th><?php echo $lang->bug->mailto;?></th>
           <td colspan='2'><?php echo html::select('mailto[]', $users, str_replace(' ' , '', $bug->mailto), 'class="form-control chosen" multiple');?></td>
         </tr>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $bug, 'table', 'columns=2');?>
+        <?php $this->printExtendFields($bug, 'table', 'columns=2');?>
         <tr>
           <th><?php echo $lang->comment;?></th>
           <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='w-p94'");?></td>
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 3bbad9d2be..4774860a1d 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -288,7 +288,7 @@ js::set('flow', $config->global->flow);
              <?php endif;?>
           </tr>
           <?php endif;?>
-          <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, '', 'table', 'columns=2');?>
+          <?php $this->printExtendFields('', 'table', 'columns=2');?>
           <tr>
             <th><?php echo $lang->bug->files;?></th>
             <td colspan='2'><?php echo $this->fetch('file', 'buildform', 'fileCount=1&percent=0.85');?></td>
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index cd0d4b36e5..0f31932abe 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -62,7 +62,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
               <?php echo html::textarea('comment', '', "rows='5' class='form-control kindeditor' hidefocus='true'");?>
             </div>
           </div>
-          <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $bug, 'div', 'position=left&divCell=false');?>
+          <?php $this->printExtendFields($bug, 'div', 'position=left&divCell=false');?>
           <div class="detail">
             <div class="detail-title"><?php echo $lang->files;?></div>
             <div class='detail-content'><?php echo $this->fetch('file', 'buildform');?></div>
@@ -299,7 +299,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
               </tbody>
             </table>
           </div>
-          <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $bug, 'div', 'position=right&divCell=false');?>
+          <?php $this->printExtendFields($bug, 'div', 'position=right&divCell=false');?>
         </div>
       </div>
     </div>
diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php
index fe1b83753d..82c53c74fd 100644
--- a/module/bug/view/resolve.html.php
+++ b/module/bug/view/resolve.html.php
@@ -74,7 +74,7 @@ js::set('productID' , $bug->product);
           <th><?php echo $lang->bug->assignedTo;?></th>
           <td><?php echo html::select('assignedTo', $users, $assignedTo, "class='form-control chosen'");?></td>
         </tr>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $bug, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($bug, 'table', 'columns=1');?>
         <tr>
           <th><?php echo $lang->bug->files;?></th>
           <td colspan='2'><?php echo $this->fetch('file', 'buildform', 'fileCount=1&percent=0.85');?></td>
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 59636d16a4..5173860b7a 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -58,7 +58,7 @@
       <?php echo $this->fetch('file', 'printFiles', array('files' => $bug->files, 'fieldset' => 'true'));?>
       <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=bug&objectID=$bug->id");?>
     </div>
-    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $bug, 'div', "position=left&divCell=true");?>
+    <?php $this->printExtendFields($bug, 'div', "position=left&divCell=true");?>
     <div class='cell'><?php include '../../common/view/action.html.php';?></div>
     <?php
     $params        = "bugID=$bug->id";
@@ -379,7 +379,7 @@
         </div>
       </div>
     </div>
-    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $bug, 'div', "position=right&divCell=true");?>
+    <?php $this->printExtendFields($bug, 'div', "position=right&divCell=true");?>
   </div>
 </div>
 
diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php
index 0a61f12fbf..e944362f84 100644
--- a/module/build/view/create.html.php
+++ b/module/build/view/create.html.php
@@ -64,7 +64,7 @@
           <th><?php echo $lang->build->filePath;?></th>
           <td colspan='2'><?php echo html::input('filePath', '', "class='form-control' placeholder='{$lang->build->placeholder->filePath}'");?></td>
         </tr>  
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, '', 'table', 'columns=2');?>
+        <?php $this->printExtendFields('', 'table', 'columns=2');?>
         <tr>
           <th><?php echo $lang->build->files;?></th>
           <td colspan='2'><?php echo $this->fetch('file', 'buildForm');?></td>
diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php
index 42a59d94a1..16b71e5987 100644
--- a/module/build/view/edit.html.php
+++ b/module/build/view/edit.html.php
@@ -58,7 +58,7 @@
           <th><?php echo $lang->build->filePath;?></th>
           <td colspan='2'><?php echo html::input('filePath', $build->filePath, "class='form-control' placeholder='{$lang->build->placeholder->filePath}'");?></td>
         </tr>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $build, 'table', 'columns=2');?>
+        <?php $this->printExtendFields($build, 'table', 'columns=2');?>
         <tr>
           <th><?php echo $lang->build->files;?></th>
           <td colspan='2'><?php echo $this->fetch('file', 'buildForm');?></td>
diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index f421fad2b7..977298f0e1 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -336,7 +336,7 @@ tbody tr td:first-child input{display:none;}
                   <th><?php echo $lang->build->filePath;?></th>
                   <td style='word-break:break-all;'><?php echo html::a($build->filePath, $build->filePath, '_blank');?></td>
                 </tr>
-                <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $build, 'table', "position=all&columns=1");?>
+                <?php $this->printExtendFields($build, 'table', "position=all&columns=1");?>
                 <?php if($config->global->flow != 'onlyTest'):?>
                 <tr>
                   <th style="vertical-align:top"><?php echo $lang->build->desc;?></th>
diff --git a/module/product/view/close.html.php b/module/product/view/close.html.php
index 0a122abc5f..5f14c87886 100644
--- a/module/product/view/close.html.php
+++ b/module/product/view/close.html.php
@@ -24,7 +24,7 @@
   </div>
   <form class='load-indicator main-form' method='post' target='hiddenwin'>
     <table class='table table-form'>
-      <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $product, 'table', 'columns=2');?>
+      <?php $this->printExtendFields($product, 'table', 'columns=2');?>
       <tr>
         <th class='w-40px'><?php echo $lang->comment;?></th>
         <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php
index 52b34ccaa3..611576ddf4 100644
--- a/module/product/view/create.html.php
+++ b/module/product/view/create.html.php
@@ -68,7 +68,7 @@
               <?php echo html::textarea('desc', '', "rows='8' class='form-control kindeditor' hidefocus='true' tabindex=''");?>
             </td>
           </tr>  
-          <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, '', 'table', 'columns=2');?>
+          <?php $this->printExtendFields('', 'table', 'columns=2');?>
           <tr>
             <th><?php echo $lang->product->acl;?></th>
             <td colspan='2'><?php echo nl2br(html::radio('acl', $lang->product->aclList, 'open', "onclick='setWhite(this.value);'", 'block'));?></td>
diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php
index 0581d86309..c5dd629798 100644
--- a/module/product/view/edit.html.php
+++ b/module/product/view/edit.html.php
@@ -62,7 +62,7 @@
             <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 if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $product, 'table', 'columns=2');?>
+          <?php $this->printExtendFields($product, 'table', 'columns=2');?>
           <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/product/view/view.html.php b/module/product/view/view.html.php
index 46e6e059c1..bdc21b4bae 100644
--- a/module/product/view/view.html.php
+++ b/module/product/view/view.html.php
@@ -75,7 +75,7 @@
           </div>
         </div>
       </div>
-      <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $product, 'div', "position=left&divCell=false");?>
+      <?php $this->printExtendFields($product, 'div', "position=left&divCell=false");?>
       <div class="col-sm-12">
         <?php $blockHistory = true;?>
         <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=product&objectID=$product->id");?>
@@ -237,7 +237,7 @@
             </div>
           </div>
           <?php endif;?>
-          <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $product, 'div', "position=right&divCell=false");?>
+          <?php $this->printExtendFields($product, 'div', "position=right&divCell=false");?>
         </div>
       </div>
     </div>
diff --git a/module/productplan/view/create.html.php b/module/productplan/view/create.html.php
index 0aaa311e4b..e969304383 100644
--- a/module/productplan/view/create.html.php
+++ b/module/productplan/view/create.html.php
@@ -63,7 +63,7 @@
             <th><?php echo $lang->productplan->desc;?></th>
             <td colspan='3'><?php echo html::textarea('desc', '', "rows='10' class='form-control kindeditor' hidefocus='true'");?></td>
           </tr>
-          <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, '', 'table', 'columns=3');?>
+          <?php $this->printExtendFields('', 'table', 'columns=3');?>
           <tr>
             <td colspan='4' class='text-center form-actions'>
               <?php echo html::submitButton();?>
diff --git a/module/productplan/view/edit.html.php b/module/productplan/view/edit.html.php
index 064f7ced4a..a8708a0391 100644
--- a/module/productplan/view/edit.html.php
+++ b/module/productplan/view/edit.html.php
@@ -56,7 +56,7 @@
             <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 if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $plan, 'table', 'columns=3');?>
+          <?php $this->printExtendFields($plan, 'table', 'columns=3');?>
           <tr>
             <td colspan='4' class='text-center form-actions'>
               <?php echo html::submitButton();?>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index a5ff4add93..ee52dc4d8e 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -456,7 +456,7 @@
                   </td>
                 </tr>
                 <?php endif;?>
-                <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $plan, 'table', "position=all&columns=1");?>
+                <?php $this->printExtendFields($plan, 'table', "position=all&columns=1");?>
                 <tr>
                   <th><?php echo $lang->productplan->desc;?></th>
                   <td><?php echo $plan->desc;?></td>
diff --git a/module/project/view/activate.html.php b/module/project/view/activate.html.php
index f88aebe203..47900bd92c 100644
--- a/module/project/view/activate.html.php
+++ b/module/project/view/activate.html.php
@@ -49,7 +49,7 @@
           </div>
         </td>
       </tr>
-      <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $project, 'table', 'columns=5');?>
+      <?php $this->printExtendFields($project, 'table', 'columns=5');?>
       <tr>
         <th><?php echo $lang->comment;?></th>
         <td colspan='5'><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
diff --git a/module/project/view/close.html.php b/module/project/view/close.html.php
index b48a66a5bd..85ba9af2ff 100644
--- a/module/project/view/close.html.php
+++ b/module/project/view/close.html.php
@@ -25,7 +25,7 @@
   <form class='load-indicator main-form' method='post' target='hiddenwin'>
     <table class='table table-form'>
       <tbody>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $project, 'table', 'columns=2');?>
+        <?php $this->printExtendFields($project, 'table', 'columns=2');?>
         <tr>
           <th class='w-50px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index c2eedacef4..ae09dd74bd 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -139,7 +139,7 @@
             <?php echo html::textarea('desc', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?>
           </td>
         </tr>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, '', 'table', 'columns=3');?>
+        <?php $this->printExtendFields('', 'table', 'columns=3');?>
         <tr>
           <th><?php echo $lang->project->acl;?></th>
           <td colspan='3'><?php echo nl2br(html::radio('acl', $lang->project->aclList, $acl, "onclick='setWhite(this.value);'", 'block'));?></td>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index 1916c40447..0cceba831a 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -150,7 +150,7 @@
           <th><?php echo $lang->project->desc;?></th>
           <td colspan='2'><?php echo html::textarea('desc', htmlspecialchars($project->desc), "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
         </tr>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $project, 'table', 'columns=3');?>
+        <?php $this->printExtendFields($project, 'table', 'columns=3');?>
         <tr>
           <th><?php echo $lang->project->acl;?></th>
           <td colspan='2'><?php echo nl2br(html::radio('acl', $lang->project->aclList, $project->acl, "onclick='setWhite(this.value);'", 'block'));?></td>
diff --git a/module/project/view/putoff.html.php b/module/project/view/putoff.html.php
index 1ad35fa332..8a415c5bf3 100644
--- a/module/project/view/putoff.html.php
+++ b/module/project/view/putoff.html.php
@@ -55,7 +55,7 @@
           </td> 
           <td></td>
         </tr> 
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $project, 'table', 'columns=3');?>
+        <?php $this->printExtendFields($project, 'table', 'columns=3');?>
         <tr>
           <th><?php echo $lang->comment;?></th>
           <td colspan='3'><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
diff --git a/module/project/view/start.html.php b/module/project/view/start.html.php
index 14000aebfa..aeaaf9b1af 100644
--- a/module/project/view/start.html.php
+++ b/module/project/view/start.html.php
@@ -25,7 +25,7 @@
   <form class='load-indicator main-form' method='post' target='hiddenwin'>
     <table class='table table-form'>
       <tbody>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $project, 'table', 'columns=2');?>
+        <?php $this->printExtendFields($project, 'table', 'columns=2');?>
         <tr>
           <th class='w-40px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
diff --git a/module/project/view/suspend.html.php b/module/project/view/suspend.html.php
index fd1ad7ebff..85245e4e3a 100644
--- a/module/project/view/suspend.html.php
+++ b/module/project/view/suspend.html.php
@@ -24,7 +24,7 @@
   </div>
   <form class='load-indicator main-form' method='post' target='hiddenwin'>
     <table class='table table-form'>
-      <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $project, 'table', 'columns=2');?>
+      <?php $this->printExtendFields($project, 'table', 'columns=2');?>
       <tr>
         <th class='w-50px'><?php echo $lang->comment;?></th>
         <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index 191d314de3..9a66fe97cc 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -140,7 +140,7 @@
             </div>
           </div>
         </div>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $project, 'div', "position=left&divCell=false");?>
+        <?php $this->printExtendFields($project, 'div', "position=left&divCell=false");?>
         <div class="col-sm-12">
           <?php $blockHistory = true;?>
           <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=project&objectID=$project->id");?>
@@ -296,7 +296,7 @@
                 <?php endif;?>
               </div>
             </div>
-            <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $project, 'div', "position=right&divCell=false");?>
+            <?php $this->printExtendFields($project, 'div', "position=right&divCell=false");?>
           </div>
         </div>
       </div>
diff --git a/module/release/view/create.html.php b/module/release/view/create.html.php
index 1c780aea4b..82fcd40458 100644
--- a/module/release/view/create.html.php
+++ b/module/release/view/create.html.php
@@ -43,7 +43,7 @@
             <th><?php echo $lang->release->desc;?></th>
             <td colspan='2'><?php echo html::textarea('desc', '', "rows='10' class='form-control kindeditor' hidefocus='true'");?></td>
           </tr>
-          <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, '', 'table', 'columns=2');?>
+          <?php $this->printExtendFields('', 'table', 'columns=2');?>
           <tr>
             <th><?php echo $lang->files;?></th>
             <td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>
diff --git a/module/release/view/edit.html.php b/module/release/view/edit.html.php
index b6a811c435..c256264445 100644
--- a/module/release/view/edit.html.php
+++ b/module/release/view/edit.html.php
@@ -51,7 +51,7 @@
             <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 if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $release, 'table', 'columns=2');?>
+          <?php $this->printExtendFields($release, 'table', 'columns=2');?>
           <tr>
             <th><?php echo $lang->files;?></th>
             <td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index a15e1dd52e..d533f04e65 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -331,7 +331,7 @@
                       <th><?php echo $lang->release->date;?></th>
                       <td><?php echo $release->date;?></td>
                     </tr>
-                    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $release, 'table', "position=all&columns=1");?>
+                    <?php $this->printExtendFields($release, 'table', "position=all&columns=1");?>
                     <tr>
                       <th><?php echo $lang->release->desc;?></th>
                       <td><?php echo $release->desc;?></td>
diff --git a/module/story/view/activate.html.php b/module/story/view/activate.html.php
index d8a4c86b3a..4ebed040f0 100644
--- a/module/story/view/activate.html.php
+++ b/module/story/view/activate.html.php
@@ -38,7 +38,7 @@
             ?>
           </td>
         </tr>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $story, 'table', 'columns=2');?>
+        <?php $this->printExtendFields($story, 'table', 'columns=2');?>
         <tr>
           <th><?php echo $lang->story->comment;?></th>
           <td colspan='2'><?php echo html::textarea('comment', '', 'rows=5 class="area-1"');?></td>
diff --git a/module/story/view/assignto.html.php b/module/story/view/assignto.html.php
index 6b40145115..c298f7032b 100644
--- a/module/story/view/assignto.html.php
+++ b/module/story/view/assignto.html.php
@@ -29,7 +29,7 @@
           <th class='w-80px'><?php echo $lang->story->assign;?></th>
           <td class='w-p25-f'><?php echo html::select('assignedTo', $users, $story->assignedTo, "class='form-control chosen'");?></td><td></td>
         </tr>  
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $story, 'table', 'columns=2');?>
+        <?php $this->printExtendFields($story, 'table', 'columns=2');?>
         <tr>
           <th><?php echo $lang->comment;?></th>
           <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control w-p98'");?></td>
diff --git a/module/story/view/change.html.php b/module/story/view/change.html.php
index acacaeb815..b8821e3f05 100644
--- a/module/story/view/change.html.php
+++ b/module/story/view/change.html.php
@@ -51,7 +51,7 @@
           <th><?php echo $lang->story->comment;?></th>
           <td><?php echo html::textarea('comment', '', 'rows=5 class="form-control"');?></td>
         </tr>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $story, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($story, 'table', 'columns=1');?>
         <tr>
           <th><?php echo $lang->attatch;?></th>
           <td><?php echo $this->fetch('file', 'buildform');?></td>
diff --git a/module/story/view/close.html.php b/module/story/view/close.html.php
index 94e9deb613..840046ddf4 100644
--- a/module/story/view/close.html.php
+++ b/module/story/view/close.html.php
@@ -37,7 +37,7 @@
           <th><?php echo $lang->story->childStories;?></th>
           <td><?php echo html::input('childStories', '', "class='form-control'");?></td><td></td>
         </tr>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $story, 'table', 'columns=2');?>
+        <?php $this->printExtendFields($story, 'table', 'columns=2');?>
         <tr>
           <th><?php echo $lang->story->comment;?></th>
           <td colspan='2'><?php echo html::textarea('comment', '', "rows='8' class='form-control'");?></td>
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 64ccb7897b..0249477ef9 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -173,7 +173,7 @@
             <td colspan="4"><?php echo html::textarea('verify', $verify, "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
           </tr>
           <?php endif;?>
-          <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, '', 'table', 'columns=4');?>
+          <?php $this->printExtendFields('', 'table', 'columns=4');?>
           <tr>
             <th><?php echo $lang->story->legendAttatch;?></th>
             <td colspan='4'><?php echo $this->fetch('file', 'buildform');?></td>
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index 5fcc459af1..a95ef0de5c 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -43,7 +43,7 @@
             <div class='detail-title'><?php echo $lang->story->verify;?></div>
             <div class='detail-content article-content'><?php echo $story->verify;?></div>
           </div>
-          <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $story, 'div', 'position=left&divCell=false');?>
+          <?php $this->printExtendFields($story, 'div', 'position=left&divCell=false');?>
           <div class='detail'>
             <div class='detail-title'><?php echo $lang->story->comment;?></div>
             <div class='form-group'>
@@ -198,7 +198,7 @@
             </table>
           </div>
     
-          <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $story, 'div', 'position=right&divCell=false');?>
+          <?php $this->printExtendFields($story, 'div', 'position=right&divCell=false');?>
 
           <div class='detail'>
             <div class='detail-title'><?php echo $lang->story->legendMisc;?></div>
diff --git a/module/story/view/review.html.php b/module/story/view/review.html.php
index 24108cd59e..5ffb7c0650 100644
--- a/module/story/view/review.html.php
+++ b/module/story/view/review.html.php
@@ -69,7 +69,7 @@ var assignedTo = '<?php $story->lastEditedBy ? print($story->lastEditedBy) : pri
           <th><?php echo $lang->story->reviewedBy;?></th>
           <td colspan='2'><?php echo html::select('reviewedBy[]', $users, $app->user->account, "class='form-control' multiple data-placeholder='{$lang->story->chosen->reviewedBy}'");?></td>
         </tr>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $story, 'table', 'columns=2');?>
+        <?php $this->printExtendFields($story, 'table', 'columns=2');?>
         <tr>
           <th><?php echo $lang->story->comment;?></th>
           <td colspan='2'><?php echo html::textarea('comment', '', "rows='8' class='form-control'");?></td>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 578b79395a..855819bc69 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -62,7 +62,7 @@
       <?php echo $this->fetch('file', 'printFiles', array('files' => $story->files, 'fieldset' => 'true'));?>
       <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=story&objectID=$story->id");?>
     </div>
-    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $story, 'div', "position=left&divCell=true");?>
+    <?php $this->printExtendFields($story, 'div', "position=left&divCell=true");?>
     <div class="cell"><?php include '../../common/view/action.html.php';?></div>
     <div class='main-actions'>
       <div class="btn-toolbar">
@@ -390,7 +390,7 @@
         </div>
       </div>
     </div>
-    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $story, 'div', "position=right&divCell=true");?>
+    <?php $this->printExtendFields($story, 'div', "position=right&divCell=true");?>
   </div>
 </div>
 
diff --git a/module/task/view/activate.html.php b/module/task/view/activate.html.php
index 9f60379e15..52c9ecd1ca 100644
--- a/module/task/view/activate.html.php
+++ b/module/task/view/activate.html.php
@@ -41,7 +41,7 @@
             </div>
           </td>
         </tr>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $task, 'table', 'columns=2');?>
+        <?php $this->printExtendFields($task, 'table', 'columns=2');?>
         <tr>
           <th><?php echo $lang->comment;?></th>
           <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php
index 42fb781d76..cc49284cc9 100644
--- a/module/task/view/assignto.html.php
+++ b/module/task/view/assignto.html.php
@@ -43,7 +43,7 @@
           <td><div class='input-group'><?php echo html::input('left', $task->left, "class='form-control'");?> <span class='input-group-addon'><?php echo $lang->task->hour;?></span></div></td><td></td>
         </tr>  
         <?php endif;?>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $task, 'table', 'columns=2');?>
+        <?php $this->printExtendFields($task, 'table', 'columns=2');?>
         <tr>
           <th><?php echo $lang->comment;?></th>
           <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control w-p98'");?></td>
diff --git a/module/task/view/cancel.html.php b/module/task/view/cancel.html.php
index 7c07e99056..dee2fd5f2f 100644
--- a/module/task/view/cancel.html.php
+++ b/module/task/view/cancel.html.php
@@ -26,7 +26,7 @@
 
     <form method='post' target='hiddenwin'>
       <table class='table table-form'>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $task, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($task, 'table', 'columns=1');?>
         <tr>
           <th class='w-50px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
diff --git a/module/task/view/close.html.php b/module/task/view/close.html.php
index a8654ba389..1341e7cd4b 100644
--- a/module/task/view/close.html.php
+++ b/module/task/view/close.html.php
@@ -26,7 +26,7 @@
     
     <form method='post' target='hiddenwin'>
       <table class='table table-form'>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $task, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($task, 'table', 'columns=1');?>
         <tr>
           <th class='w-50px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 544842606a..289c7c5765 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -205,7 +205,7 @@
             <?php echo html::textarea('desc', $task->desc, "rows='10' class='form-control'");?>
           </td>
         </tr>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, '', 'table', 'columns=3');?>
+        <?php $this->printExtendFields('', 'table', 'columns=3');?>
         <tr>
           <th><?php echo $lang->files;?></th>
           <td colspan='3'><?php echo $this->fetch('file', 'buildform');?></td>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 5b12435cce..5162fd43e5 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -70,7 +70,7 @@
             <div class='detail-title'><?php echo $lang->comment;?></div>
             <div class='detail-content'><?php echo html::textarea('comment', '',  "rows='5' class='form-control'");?></div>
           </div>
-          <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $task, 'div', 'position=left&divCell=false');?>
+          <?php $this->printExtendFields($task, 'div', 'position=left&divCell=false');?>
           <div class='detail'>
             <div class='detail-title'><?php echo $lang->files;?></div>
             <div class='detail-content'><?php echo $this->fetch('file', 'buildform');?></div>
diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php
index a7b4f51cdc..651c97f211 100644
--- a/module/task/view/finish.html.php
+++ b/module/task/view/finish.html.php
@@ -70,7 +70,7 @@
           <th><?php echo $lang->task->finishedDate;?></th>
           <td><div class='datepicker-wrapper'><?php echo html::input('finishedDate', helper::today(), "class='form-control form-date'");?></div></td><td></td>
         </tr>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $task, 'table', 'columns=2');?>
+        <?php $this->printExtendFields($task, 'table', 'columns=2');?>
         <tr>
           <th><?php echo $lang->files;?></th>
           <td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>
diff --git a/module/task/view/pause.html.php b/module/task/view/pause.html.php
index 17c97442d7..97a66e7377 100644
--- a/module/task/view/pause.html.php
+++ b/module/task/view/pause.html.php
@@ -34,7 +34,7 @@
 
     <form method='post' target='hiddenwin'>
       <table class='table table-form'>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $task, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($task, 'table', 'columns=1');?>
         <tr>
           <th class='w-60px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php
index ff3b2f10b0..66f330cfce 100644
--- a/module/task/view/start.html.php
+++ b/module/task/view/start.html.php
@@ -61,7 +61,7 @@
             </div>
           </td>
         </tr>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $task, 'table', 'columns=2');?> 
+        <?php $this->printExtendFields($task, 'table', 'columns=2');?> 
         <tr>
           <th><?php echo $lang->comment;?></th>
           <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index 960a33805b..4740e22767 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -145,7 +145,7 @@
       <?php echo $this->fetch('file', 'printFiles', array('files' => $task->files, 'fieldset' => 'true'));?>
       <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=task&objectID=$task->id");?>
     </div>
-    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $task, 'div', "position=left&divCell=true");?>
+    <?php $this->printExtendFields($task, 'div', "position=left&divCell=true");?>
     <div class="cell"><?php include '../../common/view/action.html.php';?></div>
     <div class='main-actions'>
       <div class="btn-toolbar">
@@ -379,7 +379,7 @@
         </div>
       </details>
     </div>
-    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $task, 'div', "position=right&divCell=true");?>
+    <?php $this->printExtendFields($task, 'div', "position=right&divCell=true");?>
   </div>
 </div>
 
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index e28496bbc9..4b5315191c 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -206,7 +206,7 @@
           <td colspan='2'><?php echo html::input('keywords', $keywords, "class='form-control'");?></td>
         </tr>
         <?php endif;?>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, '', 'table', 'columns=2');?>
+        <?php $this->printExtendFields('', 'table', 'columns=2');?>
         <tr>
           <th><?php echo $lang->testcase->files;?></th>
           <td colspan='2'><?php echo $this->fetch('file', 'buildform');?></td>
diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php
index 4f25dda342..835c144d15 100644
--- a/module/testcase/view/edit.html.php
+++ b/module/testcase/view/edit.html.php
@@ -113,7 +113,7 @@
               </table>
             </div>
           </div>
-          <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $case, 'div', 'position=left&divCell=false');?>
+          <?php $this->printExtendFields($case, 'div', 'position=left&divCell=false');?>
           <div class='detail'>
             <div class='detail-title'><?php echo $lang->testcase->legendComment;?></div>
             <div class='detail-content'><?php echo html::textarea('comment', '',  "rows='5' class='form-control'");?></div>
diff --git a/module/testcase/view/review.html.php b/module/testcase/view/review.html.php
index 9e19070e2d..5ea37f73e1 100644
--- a/module/testcase/view/review.html.php
+++ b/module/testcase/view/review.html.php
@@ -35,7 +35,7 @@
         <th><?php echo $lang->testcase->reviewedByAB;?></th>
         <td colspan='2'><?php echo html::select('reviewedBy[]', $users, $app->user->account, "class='form-control chosen' multiple");?></td>
       </tr>
-      <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $case, 'table', 'columns=2');?> 
+      <?php $this->printExtendFields($case, 'table', 'columns=2');?> 
       <tr>
         <th><?php echo $lang->comment;?></th>
         <td colspan='2'><?php echo html::textarea('comment', '', "rows='8' class='form-control'");?></td>
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index ccca8ef333..015dffec12 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -96,7 +96,7 @@
       </div>
       <?php echo $this->fetch('file', 'printFiles', array('files' => $case->files, 'fieldset' => 'true'));?>
     </div>
-    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $case, 'div', "position=left&divCell=true");?>
+    <?php $this->printExtendFields($case, 'div', "position=left&divCell=true");?>
     <div class='cell'><?php include '../../common/view/action.html.php';?></div>
     <div class='main-actions'>
       <div class="btn-toolbar">
@@ -333,7 +333,7 @@
         </div>
       </details>
     </div>
-    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $case, 'div', "position=right&divCell=true");?>
+    <?php $this->printExtendFields($case, 'div', "position=right&divCell=true");?>
   </div>
 </div>
 <div id="mainActions" class='main-actions'>
diff --git a/module/testsuite/view/create.html.php b/module/testsuite/view/create.html.php
index 426105b2b2..b4ca902e85 100644
--- a/module/testsuite/view/create.html.php
+++ b/module/testsuite/view/create.html.php
@@ -27,7 +27,7 @@
           <th><?php echo $lang->testsuite->desc;?></th>
           <td colspan='2'><?php echo html::textarea('desc', '', "rows=10 class='form-control'");?></td>
         </tr>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, '', 'table', 'columns=2');?>
+        <?php $this->printExtendFields('', 'table', 'columns=2');?>
         <tr>
           <th><?php echo $lang->testsuite->author;?></th>
           <td><?php echo html::radio('type', $lang->testsuite->authorList, 'private');?></td>
diff --git a/module/testsuite/view/edit.html.php b/module/testsuite/view/edit.html.php
index 6f21fe3dfa..b6688bd2c6 100644
--- a/module/testsuite/view/edit.html.php
+++ b/module/testsuite/view/edit.html.php
@@ -27,7 +27,7 @@
           <th><?php echo $lang->testsuite->desc;?></th>
           <td><?php echo html::textarea('desc', htmlspecialchars($suite->desc), "rows=10 class='form-control'");?></td>
         </tr>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $suite, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($suite, 'table', 'columns=1');?>
         <?php if($suite->type != 'library'):?>
         <tr>
           <th><?php echo $lang->testsuite->author;?></th>
diff --git a/module/testsuite/view/view.html.php b/module/testsuite/view/view.html.php
index f6b00a9458..a929141b11 100644
--- a/module/testsuite/view/view.html.php
+++ b/module/testsuite/view/view.html.php
@@ -154,7 +154,7 @@
         </div>
       </div>
     </div>
-    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $suite, 'div', "position=right&divCell=true");?>
+    <?php $this->printExtendFields($suite, 'div', "position=right&divCell=true");?>
     <div class='cell'>
       <?php include '../../common/view/action.html.php';?>
     </div>
diff --git a/module/testtask/view/activate.html.php b/module/testtask/view/activate.html.php
index 74a385827f..097dbeef64 100644
--- a/module/testtask/view/activate.html.php
+++ b/module/testtask/view/activate.html.php
@@ -23,7 +23,7 @@
     </div>
     <form class='load-indicator main-form' method='post' id='activateForm'>
       <table class='table table-form'>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $task, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($task, 'table', 'columns=1');?>
         <tr>
           <th class='w-45px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
diff --git a/module/testtask/view/block.html.php b/module/testtask/view/block.html.php
index 8d8a5dd3df..e7ec34fff1 100644
--- a/module/testtask/view/block.html.php
+++ b/module/testtask/view/block.html.php
@@ -24,7 +24,7 @@
     </div>
     <form class='load-indicator main-form' method='post' id='blockForm'>
       <table class='table table-form'>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $task, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($task, 'table', 'columns=1');?>
         <tr>
           <th class='w-45px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
diff --git a/module/testtask/view/close.html.php b/module/testtask/view/close.html.php
index 7e322a87e4..23758c500e 100644
--- a/module/testtask/view/close.html.php
+++ b/module/testtask/view/close.html.php
@@ -23,7 +23,7 @@
     </div>
     <form class='load-indicator main-form' method='post' id='closeForm'>
       <table class='table table-form'>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $task, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($task, 'table', 'columns=1');?>
         <tr>
           <th class='w-60px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php
index 69727874f4..504dfdb255 100644
--- a/module/testtask/view/create.html.php
+++ b/module/testtask/view/create.html.php
@@ -94,7 +94,7 @@
             </div>
           </td>
         </tr>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, '', 'table', 'columns=2');?>
+        <?php $this->printExtendFields('', 'table', 'columns=2');?>
         <tr>
           <td class='text-center form-actions' colspan='3'>
             <?php echo html::submitButton();?>
diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php
index 9b6ece48d5..46a039505f 100644
--- a/module/testtask/view/edit.html.php
+++ b/module/testtask/view/edit.html.php
@@ -83,7 +83,7 @@
             </div>
           </td>
         </tr>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $task, 'table', 'columns=2');?>
+        <?php $this->printExtendFields($task, 'table', 'columns=2');?>
         <tr>
           <td class='text-center form-actions' colspan='3'>
             <?php echo html::submitButton();?>
diff --git a/module/testtask/view/start.html.php b/module/testtask/view/start.html.php
index 831ab3cbbf..124b51940c 100644
--- a/module/testtask/view/start.html.php
+++ b/module/testtask/view/start.html.php
@@ -25,7 +25,7 @@
     </div>
     <form class='load-indicator main-form' method='post' id='startForm'>
       <table class='table table-form'>
-        <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $task, 'table', 'columns=1');?>
+        <?php $this->printExtendFields($task, 'table', 'columns=1');?>
         <tr>
           <th class='w-45px'><?php echo $lang->comment;?></th>
           <td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
diff --git a/module/testtask/view/view.html.php b/module/testtask/view/view.html.php
index f0a20786e5..d37b04d66b 100644
--- a/module/testtask/view/view.html.php
+++ b/module/testtask/view/view.html.php
@@ -41,7 +41,7 @@
       <?php endif;?>
       <?php $actionFormLink = $this->createLink('action', 'comment', "objectType=testtask&objectID=$task->id");?>
     </div>
-    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $task, 'div', "position=left&divCell=true");?>
+    <?php $this->printExtendFields($task, 'div', "position=left&divCell=true");?>
     <div class='cell'><?php include '../../common/view/action.html.php';?></div>
     <div class='main-actions'>
       <div class="btn-toolbar">
@@ -127,7 +127,7 @@
         </div>
       </div>
     </div>
-    <?php if(isset($this->config->bizVersion)) $this->loadModel('flow')->printFields($app->moduleName, $app->methodName, $task, 'div', "position=right&divCell=true");?>
+    <?php $this->printExtendFields($task, 'div', "position=right&divCell=true");?>
   </div>
 </div>