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

Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

Browse Source
This commit is contained in:
wangyidong
2021-03-25 13:29:25 +08:00
parent c4cfbc1e52 820fcf1e38
commit bded3a590f
4 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
-2
View File
@@ -490,8 +490,6 @@ class project extends control
$this->project->setMenu($projectID);
$this->app->session->set('projectList', $this->app->getURI(true), 'project');
$products = $this->loadModel('product')->getProducts($projectID);
$linkedBranches = array();
foreach($products as $product)
module/search/control.php
+1
View File
@@ -216,6 +216,7 @@ class search extends control
$this->session->set('testsuiteList', $uri, 'qa');
$this->session->set('issueList', $uri, 'project');
$this->session->set('riskList', $uri, 'project');
$this->session->set('caselibList', $uri, 'qa');
$this->session->set('searchIngWord', $words);
$this->session->set('searchIngType', $type);
module/testtask/view/results.html.php
+2 -2
View File
@@ -53,8 +53,8 @@
<?php $params = isset($testtask) ? ",testtask=$testtask->id,executionID=$testtask->execution,buildID=$testtask->build" : '';?>
<tr class='result-detail hide' id='tr-detail_<?php echo $trCount++; ?>'>
<td colspan='7' class='pd-0'>
<?php $projectParam = $this->app->openApp == 'project' ? "projectID={$this->session->project}" : ''?>
<form data-params='<?php echo "product=$case->product&branch=$case->branch&extras=$projectParam,caseID=$case->id,version=$case->version,resultID=$result->id,runID=$runID" . $params?>' method='post'>
<?php $projectParam = $this->app->openApp == 'project' ? "projectID={$this->session->project}," : ''?>
<form data-params='<?php echo "product=$case->product&branch=$case->branch&extras={$projectParam}caseID=$case->id,version=$case->version,resultID=$result->id,runID=$runID" . $params?>' method='post'>
<table class='table table-condensed resultSteps'>
<thead>
<tr>
module/todo/control.php
-1
View File
@@ -373,7 +373,6 @@ class todo extends control
/* Save the session. */
$uri = $this->app->getURI(true);
$this->session->set('todoList', $uri, 'my');
$this->session->set('bugList', $uri, 'qa');
$this->session->set('taskList', $uri, 'execution');
$this->session->set('storyList', $uri, 'product');