Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug : Unit test product drop-down error.

Browse Source
This commit is contained in:
xieqiyu
2021-12-02 09:12:50 +08:00
parent 32a526275d
commit 3755502cf5
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/branch/view/ajaxgetdropmenu.html.php
+1 -1
View File
@@ -13,7 +13,7 @@ foreach($branches as $branchID => $branch)
if($branchID == 'all' or empty($branchID) or $statusList[$branchID] == 'active')
{
$activeBranchesHtml .= html::a($linkHtml, $branch, '', "class='$selected' data-key='{$branchesPinyin[$branch]}' data-app='{$this->app->tab}'");
$activeBranchesHtml .= html::a($linkHtml, $branch, '', "class='$selected' data-key='{$branchesPinyin[$branch]}'");
}
else
{
module/product/model.php
+1 -1
View File
@@ -1971,7 +1971,7 @@ class productModel extends model
{
parse_str($extra, $output);
$projectID = isset($output['projectID']) ? $output['projectID'] : 0;
$link = helper::createLink($module, $method, "productID=%s" . ($branch ? "&branch=%s" : '') . "&groupBy=&projectID=$projectID");
$link = helper::createLink($module, $method, "productID=%s&branch=" . ($branch ? "%s" : '') . "&groupBy=&projectID=$projectID") . "#app=project";
}
else
{
module/product/view/ajaxgetdropmenu.html.php
+2 -1
View File
@@ -78,10 +78,11 @@ foreach($products as $programID => $programProducts)
$selected = $product->id == $productID ? 'selected' : '';
$productName = $product->line ? zget($lines, $product->line, '') . ' / ' . $product->name : $product->name;
$linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $product->id);
$locateTab = ($module == 'testtask' and $method == 'browseUnits' and $app->tab == 'project') ? '' : "data-app='$app->tab'";
if($product->status == 'normal' and $product->PO == $this->app->user->account)
{
$myProductsHtml .= '<li>' . html::a($linkHtml, $productName, '', "class='$selected productName' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$app->tab'") . '</li>';
$myProductsHtml .= '<li>' . html::a($linkHtml, $productName, '', "class='$selected productName' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' " . $locateTab) . '</li>';
if($selected == 'selected') $tabActive = 'myProduct';
module/story/control.php
+1
View File
@@ -1724,6 +1724,7 @@ class story extends control
*/
public function zeroCase($productID = 0, $branchID = 0, $orderBy = 'id_desc', $projectID = 0)
{
$orderBy = empty($orderBy) ? 'id_desc' : $orderBy;
$this->session->set('storyList', $this->app->getURI(true) . '#app=' . $this->app->tab, 'product');
$this->session->set('caseList', $this->app->getURI(true), $this->app->tab);