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

Merge branch 'master_xieqiyu_fixbug' into 'master'

Browse Source 
Master xieqiyu fixbug

See merge request easycorp/zentaopms!5728
This commit is contained in:
王怡栋
2022-10-11 08:25:44 +00:00
parent 7087125106 8f8349b76f
commit b59b3babbd
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+4 -4
View File
@@ -617,17 +617,17 @@ class projectModel extends model
}
elseif($module == 'repo')
{
$link = helper::createLink($module, 'browse', "repoID=&branchID=&objectID=%s#app=project");
$link = helper::createLink($module, 'browse', "repoID=&branchID=&objectID=%s") . "#app=project";
}
elseif($module == 'doc')
{
$link = helper::createLink($module, 'tablecontents', "type=project&objectID=%s#app=project");
$link = helper::createLink($module, 'tablecontents', "type=project&objectID=%s") . "#app=project";
}
elseif($module == 'build')
{
if($method == 'create')
{
$link = helper::createLink($module, $method, "executionID=&productID=&projectID=%s#app=project");
$link = helper::createLink($module, $method, "executionID=&productID=&projectID=%s") . "#app=project";
}
else
{
@@ -660,7 +660,7 @@ class projectModel extends model
{
if($method == 'projectsummary')
{
$link = helper::createLink($module, $method, "projectID=%s#app=project");
$link = helper::createLink($module, $method, "projectID=%s"). "#app=project";
}
else
{
module/story/view/submitreview.html.php
+2 -2
View File
@@ -27,7 +27,7 @@
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->story->reviewedBy;?></th>
<td colspan='2' id='reviewerBox' <?php if(!empty($story->reviewer)) echo "class='required'";?>>
<td colspan='2' id='reviewerBox' <?php if($this->story->checkForceReview() or !empty($story->reviewer)) echo "class='required'";?>>
<div class="table-row">
<?php if(!$this->story->checkForceReview()):?>
<div class="table-col">
@@ -43,7 +43,7 @@
</div>
<?php else:?>
<div class="table-col">
<?php echo html::select('reviewer[]', $reviewers, $story->reviewer, "class='form-control picker-select' multiple required");?>
<?php echo html::select('reviewer[]', $reviewers, $story->reviewer, "class='form-control picker-select' multiple");?>
</div>
<?php endif;?>
</div>
module/testcase/control.php
+3 -2
View File
@@ -421,8 +421,9 @@ class testcase extends control
setcookie('caseModule', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
/* Use this session link, when the tab is not QA, a session of the case list exists, and the session is not from the Dynamic page. */
$useSession = $this->app->tab != 'qa' and $this->session->caseList and strpos($this->session->caseList, 'dynamic') === false;
$response['locate'] = $useSession ? $this->session->caseList : $this->createLink('testcase', 'browse', "productID={$this->post->product}&branch={$this->post->branch}&browseType=all&param=0&orderBy=id_desc");
$useSession = ($this->app->tab != 'qa' and $this->session->caseList and strpos($this->session->caseList, 'dynamic') === false);
$locateLink = $this->app->tab == 'project' ? $this->createLink('project', 'testcase', "projectID={$this->session->project}") : $this->createLink('testcase', 'browse', "productID={$this->post->product}&branch={$this->post->branch}&browseType=all&param=0&orderBy=id_desc");
$response['locate'] = $useSession ? $this->session->caseList : $locateLink;
return $this->send($response);
}
if(empty($this->products)) $this->locate($this->createLink('product', 'create'));