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

Merge branch 'cyy_bug' into 'master'

Browse Source 
Cyy bug

See merge request easycorp/zentaopms!5924
This commit is contained in:
李玉春
2022-10-28 02:43:33 +00:00
parent 11e0ad5c0b 7716ba592e
commit 773171f523
11 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/css/testcase.css
+1
View File
@@ -2,3 +2,4 @@
.c-result {width: 80px;}
#pageNav #dropMenu .col-left {padding-bottom: 0px;}
#currentBranch + #dropMenu .col-left {padding-bottom: 30px;}
.status-blocked {left: -5px;}
module/execution/js/kanban.js
+3 -3
View File
@@ -576,7 +576,7 @@ function renderStoryItem(item, $item, col)
if(scaleSize <= 2)
{
var idHtml = scaleSize <= 1 ? ('<span class="info info-id text-muted">#' + item.id + '</span>') : '';
var priHtml = '<span class="info info-pri label-pri label-pri-' + item.pri + '" title="' + item.pri + '">' + item.pri + '</span>';
var priHtml = '<span class="info info-pri' + (item.pri ? ' label-pri label-pri-' + item.pri : '') + '" title="' + item.pri + '">' + item.pri + '</span>';
var hoursHtml = (item.estimate && scaleSize <= 1) ? ('<span class="info info-estimate text-muted">' + item.estimate + hourUnit + '</span>') : '';
var avatarHtml = renderUserAvatar(item.assignedTo, 'story', item.id, '', col.type);
var $infos = $item.find('.infos');
@@ -642,7 +642,7 @@ function renderBugItem(item, $item, col)
{
var idHtml = scaleSize <= 1 ? ('<span class="info info-id text-muted">#' + item.id + '</span>') : '';
var severityHtml = scaleSize <= 1 ? ('<span class="info info-severity label-severity" data-severity="' + item.severity + '" title="' + item.severity + '"></span>') : '';
var priHtml = '<span class="info info-pri label-pri label-pri-' + item.pri + '" title="' + item.pri + '">' + item.pri + '</span>';
var priHtml = '<span class="info info-pri' + (item.pri ? ' label-pri label-pri-' + item.pri : '') + '" title="' + item.pri + '">' + item.pri + '</span>';
var avatarHtml = renderUserAvatar(item.assignedTo, 'bug', item.id, '', col.type);
var $infos = $item.find('.infos');
@@ -707,7 +707,7 @@ function renderTaskItem(item, $item, col)
if(scaleSize <= 2)
{
var priHtml = '<span class="info info-pri label-pri label-pri-' + item.pri + '" title="' + item.pri + '">' + item.pri + '</span>';
var priHtml = '<span class="info info-pri' + (item.pri ? ' label-pri label-pri-' + item.pri : '') + '" title="' + item.pri + '">' + item.pri + '</span>';
var hoursHtml = scaleSize <= 1 && item.status != 'wait' ? ('<span class="info info-estimate text-muted">' + taskLang.leftAB + ' ' + item.left + 'h</span>') : ('<span class="info info-estimate text-muted">' + taskLang.estimateAB + ' ' + item.estimate + 'h</span>');
var avatarHtml = renderUserAvatar(item.assignedTo, 'task', item.id, '', col.type);
module/execution/js/taskkanban.js
+3 -3
View File
@@ -156,7 +156,7 @@ function renderStoryItem(item, $item, col)
if(scaleSize <= 2)
{
var idHtml = scaleSize <= 1 ? ('<span class="info info-id text-muted">#' + item.id + '</span>') : '';
var priHtml = '<span class="info info-pri label-pri label-pri-' + item.pri + '" title="' + item.pri + '">' + item.pri + '</span>';
var priHtml = '<span class="info info-pri' + (item.pri ? ' label-pri label-pri-' + item.pri : '') + '" title="' + item.pri + '">' + item.pri + '</span>';
var hoursHtml = (item.estimate && scaleSize <= 1) ? ('<span class="info info-estimate text-muted">' + item.estimate + hourUnit +'</span>') : '';
var avatarHtml = renderUserAvatar(item.assignedTo, 'story', item.id, '', col.type);
var $infos = $item.find('.infos');
@@ -221,7 +221,7 @@ function renderBugItem(item, $item, col)
{
var idHtml = scaleSize <= 1 ? ('<span class="info info-id text-muted">#' + item.id + '</span>') : '';
var severityHtml = scaleSize <= 1 ? ('<span class="info info-severity label-severity" data-severity="' + item.severity + '" title="' + item.severity + '"></span>') : '';
var priHtml = '<span class="info info-pri label-pri label-pri-' + item.pri + '" title="' + item.pri + '">' + item.pri + '</span>';
var priHtml = '<span class="info info-pri' + (item.pri ? ' label-pri label-pri-' + item.pri : '') + '" title="' + item.pri + '">' + item.pri + '</span>';
var avatarHtml = renderUserAvatar(item.assignedTo, 'bug', item.id, '', col.type);
var $infos = $item.find('.infos');
@@ -284,7 +284,7 @@ function renderTaskItem(item, $item, col)
if(scaleSize <= 2)
{
var priHtml = '<span class="info info-pri label-pri label-pri-' + item.pri + '" title="' + item.pri + '">' + item.pri + '</span>';
var priHtml = '<span class="info info-pri' + (item.pri ? ' label-pri label-pri-' + item.pri : '') + '" title="' + item.pri + '">' + item.pri + '</span>';
var hoursHtml = scaleSize <= 1 && item.status != 'wait' ? ('<span class="info info-estimate text-muted">' + taskLang.leftAB + ' ' + item.left + 'h</span>') : ('<span class="info info-estimate text-muted">' + taskLang.estimateAB + ' ' + item.estimate + 'h</span>');
var avatarHtml = renderUserAvatar(item.assignedTo, 'task', item.id, '', col.type);
module/execution/view/importbug.html.php
+1 -1
View File
@@ -56,7 +56,7 @@
</div>
<?php echo sprintf('%03d', $bug->id) . html::hidden("id[$bug->id]", $bug->id);?>
</td>
<td><span class='<?php echo 'severity' . zget($lang->bug->severityList, $bug->severity, $bug->severity)?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity)?></span></td>
<td class='c-severity'><span class='label-severity <?php echo 'severity' . zget($lang->bug->severityList, $bug->severity, $bug->severity)?>' data-severity="<?php echo $bug->severity?>"><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity)?></span></td>
<td><span class='label-pri <?php echo 'label-pri-' . $bug->pri;?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
<td class='nobr'><?php common::printLink('bug', 'view', "bugID=$bug->id", $bug->title, '', "class='preview'", true, true);?></td>
<td><span class='status-bug status-<?php echo $bug->status?>'><?php echo $this->processStatus('bug', $bug);?></span></td>
module/execution/view/view.html.php
+7 -7
View File
@@ -31,7 +31,7 @@
</div>
<?php if(common::hasPriv('execution', 'burn')):?>
<nav class="panel-actions nav nav-default">
<li><?php common::printLink('execution', 'burn', "executionID=$execution->id", '<i class="icon icon-more icon-sm"></i>', '', "title=$lang->more");?></li>
<li><?php common::printLink('execution', 'burn', "executionID=$execution->id", strtoupper($lang->more), '', "title=$lang->more");?></li>
</nav>
<?php endif;?>
</div>
@@ -60,7 +60,7 @@
<div class="panel-title"><?php echo $lang->execution->latestDynamic;?></div>
<?php if(common::hasPriv('execution', 'dynamic')):?>
<nav class="panel-actions nav nav-default">
<li><?php common::printLink('execution', 'dynamic', "executionID=$execution->id&type=all", '<i class="icon icon-more icon-sm"></i>', '', "title=$lang->more");?></li>
<li><?php common::printLink('execution', 'dynamic', "executionID=$execution->id&type=all", strtoupper($lang->more), '', "title=$lang->more");?></li>
</nav>
<?php endif;?>
</div>
@@ -84,7 +84,7 @@
<div class="panel-title"><?php echo $lang->execution->relatedMember;?></div>
<?php if(common::hasPriv('execution', 'team')):?>
<nav class="panel-actions nav nav-default">
<li><?php common::printLink('execution', 'team', "executionID=$execution->id", '<i class="icon icon-more icon-sm"></i>', '', "title=$lang->more");?></li>
<li><?php common::printLink('execution', 'team', "executionID=$execution->id", strtoupper($lang->more), '', "title=$lang->more");?></li>
</nav>
<?php endif;?>
</div>
@@ -130,7 +130,7 @@
<div class="panel-title"><?php echo $lang->execution->doclib;?></div>
<?php if(common::hasPriv('doc', 'objectLibs')):?>
<nav class="panel-actions nav nav-default">
<li><?php common::printLink('doc', 'objectLibs', "type=execution&executionID=$execution->id&from=execution", '<i class="icon icon-more icon-sm"></i>', '', "title=$lang->more");?></li>
<li><?php common::printLink('doc', 'objectLibs', "type=execution&executionID=$execution->id&from=execution", strtoupper($lang->more), '', "title=$lang->more");?></li>
</nav>
<?php endif;?>
</div>
@@ -164,7 +164,7 @@
<div class="panel-title"><?php echo $execution->name . $lang->execution->CFD;?></div>
<?php if(common::hasPriv('execution', 'cfd')):?>
<nav class="panel-actions nav nav-default">
<li><?php common::printLink('execution', 'cfd', "executionID=$execution->id&type=task&withWeekend=false&begin=$begin&end=$end", '<i class="icon icon-more icon-sm"></i>', '', "title=$lang->more");?></li>
<li><?php common::printLink('execution', 'cfd', "executionID=$execution->id&type=task&withWeekend=false&begin=$begin&end=$end", strtoupper($lang->more), '', "title=$lang->more");?></li>
</nav>
<?php endif;?>
</div>
@@ -189,7 +189,7 @@
<div class="panel-title"><?php echo $lang->execution->relatedMember;?></div>
<?php if(common::hasPriv('execution', 'team')):?>
<nav class="panel-actions nav nav-default">
<li><?php common::printLink('execution', 'team', "executionID=$execution->id", '<i class="icon icon-more icon-sm"></i>', '', "title=$lang->more");?></li>
<li><?php common::printLink('execution', 'team', "executionID=$execution->id", strtoupper($lang->more), '', "title=$lang->more");?></li>
</nav>
<?php endif;?>
</div>
@@ -331,7 +331,7 @@
<div class="detail">
<div class="detail-title">
<strong><?php echo $lang->execution->manageProducts;?></strong>
<?php if(common::hasPriv('execution', 'manageproducts')) common::printLink('execution', 'manageproducts', "executionID=$execution->id", '<i class="icon icon-more icon-sm"></i>', '', "class='btn btn-link pull-right muted'");?>
<?php if(common::hasPriv('execution', 'manageproducts')) common::printLink('execution', 'manageproducts', "executionID=$execution->id", strtoupper($lang->more), '', "class='btn btn-link pull-right muted'");?>
</div>
<div class="detail-content">
<div class="row row-grid">
module/kanban/js/view.js
+1 -1
View File
@@ -373,7 +373,7 @@ function renderKanbanItem(item, $item)
if(item.estimate == 0) $info.children('.estimate').hide();
$info.children('.pri')
.attr('class', 'pri label-pri label-pri-' + item.pri)
.attr('class', 'pri' + (item.pri ? ' label-pri label-pri-' + item.pri : ''))
.text(item.pri);
var $time = $info.children('.time');
module/project/view/view.html.php
+3 -3
View File
@@ -21,7 +21,7 @@
<div class="panel-title"><?php echo $lang->execution->latestDynamic;?></div>
<?php if($project->model != 'kanban' and common::hasPriv('project', 'dynamic')):?>
<nav class="panel-actions nav nav-default">
<li><?php common::printLink('project', 'dynamic', "projectID=$project->id&type=all", '<i class="icon icon-more icon-sm"></i>', '', "title=$lang->more");?></li>
<li><?php common::printLink('project', 'dynamic', "projectID=$project->id&type=all", strtoupper($lang->more), '', "title=$lang->more");?></li>
</nav>
<?php endif;?>
</div>
@@ -45,7 +45,7 @@
<div class="panel-title"><?php echo $lang->execution->relatedMember;?></div>
<?php if(common::hasPriv('project', 'team')):?>
<nav class="panel-actions nav nav-default">
<li><?php common::printLink('project', 'team', "projectID=$project->id", '<i class="icon icon-more icon-sm"></i>', '', "title=$lang->more");?></li>
<li><?php common::printLink('project', 'team', "projectID=$project->id", strtoupper($lang->more), '', "title=$lang->more");?></li>
</nav>
<?php endif;?>
</div>
@@ -155,7 +155,7 @@
<div class="detail">
<div class="detail-title">
<strong><?php echo $lang->project->manageProducts;?></strong>
<?php common::printLink('project', 'manageproducts', "projectID=$project->id", '<i class="icon icon-more icon-sm"></i>', '', "class='btn btn-link pull-right muted'");?>
<?php common::printLink('project', 'manageproducts', "projectID=$project->id", strtoupper($lang->more), '', "class='btn btn-link pull-right muted'");?>
</div>
<div class="detail-content">
<div class="row row-grid">
module/story/view/view.html.php
+3 -2
View File
@@ -144,7 +144,7 @@
<tr class='text-center'>
<th class='w-50px'> <?php echo $lang->story->id;?></th>
<th class='w-40px' title=<?php echo $lang->story->pri;?>><?php echo $lang->priAB;?></th>
<th> <?php echo $lang->story->title;?></th>
<th><?php echo $lang->story->title;?></th>
<th class='w-100px'><?php echo $lang->story->assignedTo;?></th>
<th class='w-90px'> <?php echo $lang->story->estimate;?></th>
<th class='w-80px'> <?php echo $lang->story->status;?></th>
@@ -157,7 +157,8 @@
<td><?php echo $child->id;?></td>
<td>
<?php
echo "<span class='label-pri label-pri-" . $child->pri . "'>";
$priClass = $child->pri ? 'label-pri label-pri-' . $child->pri : '';
echo "<span class='$priClass'>";
echo $child->pri == '0' ? '' : zget($this->lang->story->priList, $child->pri, $child->pri);
echo "</span>";
?>
module/task/view/view.html.php
+3 -3
View File
@@ -131,9 +131,9 @@
<td class='visible-lg'><?php echo $child->left;?></td>
<td class='c-actions'>
<?php
common::printIcon('task', 'start', "taskID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);
common::printIcon('task', 'close', "taskID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);
common::printIcon('task', 'finish', "taskID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);
common::printIcon('task', 'start', "taskID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);
common::printIcon('task', 'finish', "taskID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);
common::printIcon('task', 'close', "taskID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);
common::printIcon('task', 'recordEstimate', "taskID=$child->id", $child, 'list', 'time', '', 'iframe showinonlybody', true);
common::printIcon('task', 'edit', "taskID=$child->id", $child, 'list');
common::printIcon('task', 'activate', "taskID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);
module/testreport/css/common.css
+1
View File
@@ -1,2 +1,3 @@
i.icon-help {font-size: 10px;}
#refresh a.btn {border-left: none;}
.status-blocked {left: -5px;}
www/theme/default/style.css
+2 -1
View File
@@ -177,8 +177,8 @@ tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-
.status-reviewing .label-dot {background-color: #18A6FD;}
.status-cancel, .status-investigate, .status-canceled {color: #838A9D;}
.status-active .label-dot, .status-wait .label-dot {background-color: #313C52;}
.status-doing, .status-commenting, .status-checking, .status-confirmed, .status-issue.status-active {color: #FF6F42;}
.status-closed, #workflowTable td.text-center.text-muted, .status-testtask.status-done {color: #9EA3B0;}
.status-doing, .status-commenting, .status-checking, .status-confirmed, .status-issue.status-active {color: #FF6F42;}
.status-suspended, .status-pause, .status-blocked, .status-hangup, .result-testcase.blocked, .c-lastRunResult .result-blocked {color: #B89664;}
.status-done, .status-resolved, .status-replied, .status-checked, #workflowTable td.text-success, .result-testcase.pass, .c-lastRunResult .result-pass {color: #0DBB7D;}
.status-changing, .status-active.status-risk, .result-testcase.fail, .c-lastRunResult .result-fail, .severity-issue.severity-1, .c-severity .severity-1, .status-changed {color: #FB2B2B;}
@@ -211,6 +211,7 @@ tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-
.kanban-item-bug .label-severity[data-severity="3"], #legendBasicInfo .label-severity[data-severity="3"], .c-severity > .label-severity[data-severity="3"] {color: #FAAE1A; background-position: 2px -65px;}
.kanban-item-bug .label-severity[data-severity="4"], #legendBasicInfo .label-severity[data-severity="4"], .c-severity > .label-severity[data-severity="4"] {color: #B89664; background-position: 2px -101px;}
.pri-text > .label-pri {padding: 1px 5px;}
.pri-text > .label-pri, .pri-text > .label-severity {height: 20px;}
.pri-text > .label-severity {background-size: 80%; background-position: 2px -132px;}
.pri-text > .label-severity[data-severity="1"] {color: #FB2B2B; background-position: 2px -1px;}