diff --git a/module/testcase/ui/browse.html.php b/module/testcase/ui/browse.html.php index 021b1c03d1..501bf88d99 100644 --- a/module/testcase/ui/browse.html.php +++ b/module/testcase/ui/browse.html.php @@ -37,55 +37,6 @@ $canBatchAction = ($canGroupBatch || $canBatchChangeBranch || $canBa $productCount = count(array_unique(array_map(function($case){return $case->product;}, $cases))); $caseProductID = $productCount > 1 ? 0 : $productID; -if($isFromDoc) -{ - $products = $this->loadModel('product')->getPairs(); - $productChangeLink = createLink($app->rawModule, $app->rawMethod, "productID={productID}&branch=$branch&browseType=$browseType¶m=$param&caseType=$caseType&orderBy=$orderBy&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}&projectID=$projectID&from=$from&blockID=$blockID"); - - jsVar('insertListLink', createLink($app->rawModule, $app->rawMethod, "productID=$product->id&branch=$branch&browseType=$browseType¶m=$param&caseType=$caseType&orderBy=$orderBy&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}&projectID=$projectID&from=$from&blockID={blockID}")); - - formPanel - ( - setID('zentaolist'), - setClass('mb-4-important'), - set::title(sprintf($this->lang->doc->insertTitle, $this->lang->doc->zentaoList['bug'])), - set::actions(array()), - set::showExtra(false), - to::titleSuffix - ( - span - ( - setClass('text-muted text-sm text-gray-600 font-light'), - span - ( - setClass('text-warning mr-1'), - icon('help'), - ), - $lang->doc->previewTip - ) - ), - formRow - ( - formGroup - ( - set::width('1/2'), - set::name('product'), - set::label($lang->doc->product), - set::control(array('required' => false)), - set::items($products), - set::value($productID), - set::required(), - span - ( - setClass('error-tip text-danger hidden'), - $lang->doc->emptyError - ), - on::change('[name="product"]')->do("loadModal('$productChangeLink'.replace('{productID}', $(this).val()))") - ) - ) - ); -} - $navActions = array(); if($canBatchReview || $canBatchDelete || $canBatchChangeType || $canBatchConfirmStoryChange) { diff --git a/module/testcase/ui/header.html.php b/module/testcase/ui/header.html.php index 13c5a03e6f..7258f41d0d 100644 --- a/module/testcase/ui/header.html.php +++ b/module/testcase/ui/header.html.php @@ -104,6 +104,55 @@ if($canDisplaySuite) } } +if($isFromDoc) +{ + $products = $this->loadModel('product')->getPairs(); + $productChangeLink = createLink($app->rawModule, $app->rawMethod, "productID={productID}&branch=$branch&browseType=$browseType¶m=$param&caseType=$caseType&orderBy=$orderBy&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}&projectID=$projectID&from=$from&blockID=$blockID"); + + jsVar('insertListLink', createLink($app->rawModule, $app->rawMethod, "productID=$product->id&branch=$branch&browseType=$browseType¶m=$param&caseType=$caseType&orderBy=$orderBy&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}&projectID=$projectID&from=$from&blockID={blockID}")); + + formPanel + ( + setID('zentaolist'), + setClass('mb-4-important'), + set::title(sprintf($this->lang->doc->insertTitle, $this->lang->doc->zentaoList['bug'])), + set::actions(array()), + set::showExtra(false), + to::titleSuffix + ( + span + ( + setClass('text-muted text-sm text-gray-600 font-light'), + span + ( + setClass('text-warning mr-1'), + icon('help'), + ), + $lang->doc->previewTip + ) + ), + formRow + ( + formGroup + ( + set::width('1/2'), + set::name('product'), + set::label($lang->doc->product), + set::control(array('required' => false)), + set::items($products), + set::value($productID), + set::required(), + span + ( + setClass('error-tip text-danger hidden'), + $lang->doc->emptyError + ), + on::change('[name="product"]')->do("loadModal('$productChangeLink'.replace('{productID}', $(this).val()))") + ) + ) + ); +} + $linkParams = $projectParam . "productID=$productID&branch=$branch&browseType={key}¶m=0" . $suffixParam; $browseLink = createLink('testcase', 'browse', $linkParams); if($app->tab == 'project') $browseLink = createLink('project', 'testcase', $linkParams);