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

Merge branch 'master' into cyy_optimize

Browse Source
This commit is contained in:
曹延义
2022-10-11 16:47:49 +08:00
parent e7391836f7 41a26b60b4
commit 196af666e7
7 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/lang/de.php
-2
View File
@@ -214,8 +214,6 @@ $lang->product->noMatched = '"%s" kann nicht gefunden werden.' . $lang->pro
$lang->product->featureBar['browse']['allstory'] = $lang->product->allStory;
$lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed;
$lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe;
$lang->product->featureBar['browse']['openedbyme'] = $lang->product->openedByMe;
$lang->product->featureBar['browse']['reviewedbyme'] = $lang->product->reviewedByMe;
$lang->product->featureBar['browse']['reviewbyme'] = $lang->product->reviewByMe;
$lang->product->featureBar['browse']['draftstory'] = $lang->product->draftStory;
$lang->product->featureBar['browse']['more'] = $lang->more;
module/product/lang/fr.php
-2
View File
@@ -214,8 +214,6 @@ $lang->product->noMatched = '"%s" cannot be found.' . $lang->productCommon;
$lang->product->featureBar['browse']['allstory'] = $lang->product->allStory;
$lang->product->featureBar['browse']['unclosed'] = $lang->product->unclosed;
$lang->product->featureBar['browse']['assignedtome'] = $lang->product->assignedToMe;
$lang->product->featureBar['browse']['openedbyme'] = $lang->product->openedByMe;
$lang->product->featureBar['browse']['reviewedbyme'] = $lang->product->reviewedByMe;
$lang->product->featureBar['browse']['reviewbyme'] = $lang->product->reviewByMe;
$lang->product->featureBar['browse']['draftstory'] = $lang->product->draftStory;
$lang->product->featureBar['browse']['more'] = $lang->more;
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'));
module/user/css/task.css
+1
View File
@@ -2,3 +2,4 @@
.c-execution {width: 180px;}
.c-hour, .c-status {width: 70px;}
.c-deadline {width: 100px;}
td.hours:last-child {padding-right: 14px;}
www/theme/default/style.css
+1
View File
@@ -149,3 +149,4 @@ td.delayed > span {display: inline-block; height: 20px; line-height: 18px; backg
.table .table-children,
.table .is-nest-child {background: #F8F8F8;}
.table tbody td.has-child .icon-angle-right {color: #838a9d;}
.table.has-sort-head thead > tr > th:last-child {padding-right: 8px;}