Merge branch release/21.7.7 of zentao/zentaopms (#12407)

module/execution/ui/testtask.html.php

@@ -75,14 +75,14 @@ dtable
     set::plugins(array('cellspan')),
     set::onRenderCell(jsRaw('window.onRenderCell')),
     set::orderBy($orderBy),
-    set::sortLink(createLink('execution', 'testtask', "executionID={$execution->id}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&page={$pager->pageID}")),
+    set::sortLink(createLink('execution', 'testtask', "executionID={$execution->id}&productID={$productID}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&page={$pager->pageID}")),
     set::getCellSpan(jsRaw('window.getCellSpan')),
     set::footToolbar($footToolbar),
     set::footPager(usePager(array
     (
         'recPerPage'  => $pager->recPerPage,
         'recTotal'    => $pager->recTotal,
-        'linkCreator' => helper::createLink('execution', 'testtask', "executionID={$execution->id}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={recPerPage}&page={page}")
+        'linkCreator' => helper::createLink('execution', 'testtask', "executionID={$execution->id}&productID={$productID}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={recPerPage}&page={page}")
     ))),
     set::checkInfo(jsRaw('function(checkedIDList){return window.setStatistics(this, checkedIDList);}')),
     set::emptyTip($lang->testtask->noTesttask),

module/testtask/zen.php

@@ -402,7 +402,7 @@ class testtaskZen extends testtask
 
         /* 如果测试单所属产品在产品键值对中不存在，将其加入。*/
         /* Prepare the product key-value pairs. */
-        $product = $this->loadModel('product')->fetchByID($productID);
+        $product = $this->loadModel('product')->getByID($productID);
         if(!isset($this->products[$productID]) && !empty($product)) $this->products[$productID] = $product->name;
 
         $this->view->title       = $this->products[$productID] . $this->lang->hyphen . $this->lang->testtask->create;

module/tutorial/model.php

@@ -393,6 +393,8 @@ class tutorialModel extends model
         $story->spec           = '';
         $story->verify         = '';
         $story->files          = array();
+        $story->docs           = '';
+        $story->docVersions    = '';
         return $story;
     }
 
@@ -1171,6 +1173,7 @@ class tutorialModel extends model
         $testtask->name             = 'Test testtask';
         $testtask->execution        = 3;
         $testtask->build            = 1;
+        $testtask->joint            = 0;
         $testtask->type             = '';
         $testtask->owner            = '';
         $testtask->pri              = 3;