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

Merge branch 'cyy_bug_29839' into 'master'

Browse Source 
* Fix bug #29839.

See merge request easycorp/zentaopms!6175
This commit is contained in:
王怡栋
2022-11-16 02:02:46 +00:00
parent d63c39bc59 41ecdd3e89
commit b328b219e5
8 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/de.php
+2
View File
@@ -902,3 +902,5 @@ $lang->action->desc->deletemr = '$date, <strong>$actor</stro
$lang->action->desc->mergedmr = '$date, <strong>$actor</strong> merged <a href="$extra">code</a>.';
$lang->action->desc->approve = '$date, <strong>$actor</strong> approved.';
$lang->action->desc->reject = '$date, <strong>$actor</strong> rejected.';
$lang->action->desc->linkedrepo = '$date, <strong>$actor</strong> linked repo $extra';
$lang->action->desc->unlinkedrepo = '$date, <strong>$actor</strong> unlinked repo $extra';
module/action/lang/en.php
+2
View File
@@ -902,3 +902,5 @@ $lang->action->desc->deletemr = '$date, <strong>$actor</stro
$lang->action->desc->mergedmr = '$date, <strong>$actor</strong> merged <a href="$extra">code</a>.';
$lang->action->desc->approve = '$date, <strong>$actor</strong> approved.';
$lang->action->desc->reject = '$date, <strong>$actor</strong> rejected.';
$lang->action->desc->linkedrepo = '$date, <strong>$actor</strong> linked repo $extra';
$lang->action->desc->unlinkedrepo = '$date, <strong>$actor</strong> unlinked repo $extra';
module/action/lang/fr.php
+2
View File
@@ -902,3 +902,5 @@ $lang->action->desc->deletemr = '$date, <strong>$actor</stro
$lang->action->desc->mergedmr = '$date, <strong>$actor</strong> merged <a href="$extra">code</a>.';
$lang->action->desc->approve = '$date, <strong>$actor</strong> approved.';
$lang->action->desc->reject = '$date, <strong>$actor</strong> rejected.';
$lang->action->desc->linkedrepo = '$date, <strong>$actor</strong> linked repo $extra';
$lang->action->desc->unlinkedrepo = '$date, <strong>$actor</strong> unlinked repo $extra';
module/action/lang/zh-cn.php
+2
View File
@@ -902,3 +902,5 @@ $lang->action->desc->deletemr = '$date, 由 <strong>$actor</
$lang->action->desc->mergedmr = '$date, 由 <strong>$actor</strong> 合并了 <a href="$extra">代码</a>。';
$lang->action->desc->approve = '$date, 由 <strong>$actor</strong> 审核通过。';
$lang->action->desc->reject = '$date, 由 <strong>$actor</strong> 拒绝。';
$lang->action->desc->linkedrepo = '$date, 由 <strong>$actor</strong> 关联代码库 $extra';
$lang->action->desc->unlinkedrepo = '$date, 由 <strong>$actor</strong> 取消了项目与代码库 $extra 的关联';
module/execution/view/linkstory.html.php
+5 -1
View File
@@ -65,7 +65,11 @@
<?php echo html::checkbox('stories', array($story->id => sprintf('%03d', $story->id)));?>
<?php echo html::hidden("products[$story->id]", $story->product);?>
</td>
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td>
<?php if($story->pri):?>
<span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span>
<?php endif;?>
</td>
<td class='text-left nobr' title="<?php echo $story->title?>">
<?php
if($story->parent > 0) echo "<span class='label label-badge label-light'>{$lang->story->childrenAB}</span>";
module/project/model.php
+1 -1
View File
@@ -3086,7 +3086,7 @@ class projectModel extends model
->set('projects')->eq(implode(',', $newProjects))
->where('id')->eq($repo->id)->exec();
$this->action->create('project', $projectID, 'linkedRepo', $repo->name);
$this->action->create('project', $projectID, 'linkedRepo', '', $repo->name);
}
}
www/theme/default/images/severity/severity-sprite.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

www/theme/default/style.css
+17 -17
View File
@@ -195,35 +195,35 @@ tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-
.label-pri-4, .label-pri-5, .label-selector > .label-pri[data-value="4"], .label-selector > .label-pri[data-value="5"] {color: #9EA3B0; border-color: #9EA3B0;}
.label-severity:before {content: '';}
.label-selector > .label.label-severity, .label-selector > .label.label-severity.active, .c-severity > .label-severity, .pri-text > .label-severity {background: url('images/severity/severity-sprite.png') no-repeat; background-size:cover; border: none; height: 26px; line-height: 32px; background-position: 0px -165px; color: #9EA3B0;}
.label-selector > .label.label-severity[data-severity="1"], .label-selector > .label.label-severity[data-value="1"] {color: #FB2B2B; background-position: 0px -1px;}
.label-selector > .label.label-severity[data-severity="2"], .label-selector > .label.label-severity[data-value="2"] {color: #FF8058; background-position: 0px -41px;}
.label-selector > .label.label-severity, .label-selector > .label.label-severity.active, .c-severity > .label-severity, .pri-text > .label-severity {background: url('images/severity/severity-sprite.png') no-repeat; background-size:cover; border: none; height: 26px; line-height: 32px; background-position: 0px -162px; color: #9EA3B0;}
.label-selector > .label.label-severity[data-severity="1"], .label-selector > .label.label-severity[data-value="1"] {color: #FB2B2B; background-position: 0px 2px;}
.label-selector > .label.label-severity[data-severity="2"], .label-selector > .label.label-severity[data-value="2"] {color: #FF8058; background-position: 0px -39px;}
.label-selector > .label.label-severity[data-severity="3"], .label-selector > .label.label-severity[data-value="3"] {color: #FAAE1A; background-position: 0px -80px;}
.label-selector > .label.label-severity[data-severity="4"], .label-selector > .label.label-severity[data-value="4"] {color: #B89664; background-position: 0px -123px;}
.label-selector > .label.label-severity[data-severity="4"], .label-selector > .label.label-severity[data-value="4"] {color: #B89664; background-position: 0px -121px;}
.c-severity > .label-severity:after {top: 9px;}
#legendBasicInfo .label-severity:after {top: 8px;}
.kanban-item-bug .label-severity, #legendBasicInfo .label-severity, .c-severity > .label-severity {height: 28px;}
.kanban-item-bug .label-severity, #legendBasicInfo .label-severity, .c-severity > .label-severity {background: url('images/severity/severity-sprite.png') no-repeat; border: none; height: 26px; line-height: 32px; background-position: 2px -136px; color: #9EA3B0; background-size: 83%;}
#legendBasicInfo .label-severity[data-severity="1"], .c-severity > .label-severity[data-severity="1"] {color: #FB2B2B; background-position: 2px 1px;}
#legendBasicInfo .label-severity[data-severity="2"], .c-severity > .label-severity[data-severity="2"] {color: #FF8058; background-position: 2px -32px;}
.kanban-item-bug .label-severity, #legendBasicInfo .label-severity, .c-severity > .label-severity {background: url('images/severity/severity-sprite.png') no-repeat; border: none; height: 26px; line-height: 32px; background-position: 2px -133px; color: #9EA3B0; background-size: 83%;}
#legendBasicInfo .label-severity[data-severity="1"], .c-severity > .label-severity[data-severity="1"] {color: #FB2B2B; background-position: 2px 3px;}
#legendBasicInfo .label-severity[data-severity="2"], .c-severity > .label-severity[data-severity="2"] {color: #FF8058; background-position: 2px -31px;}
#legendBasicInfo .label-severity[data-severity="3"], .c-severity > .label-severity[data-severity="3"] {color: #FAAE1A; background-position: 2px -65px;}
#legendBasicInfo .label-severity[data-severity="4"], .c-severity > .label-severity[data-severity="4"] {color: #B89664; background-position: 2px -101px;}
#legendBasicInfo .label-severity[data-severity="4"], .c-severity > .label-severity[data-severity="4"] {color: #B89664; background-position: 2px -99px;}
.kanban-item-bug .label-severity:after {top: 9px;}
.kanban-item-bug .label-severity {background-position: 1px -147px; background-size: 90%;}
.kanban-item-bug .label-severity[data-severity="1"] {color: #FB2B2B; background-position: 1px 0px;}
.kanban-item-bug .label-severity[data-severity="2"] {color: #FF8058; background-position: 1px -36px;}
.kanban-item-bug .label-severity[data-severity="3"] {color: #FAAE1A; background-position: 1px -71px;}
.kanban-item-bug .label-severity[data-severity="4"] {color: #B89664; background-position: 1px -110px;}
.kanban-item-bug .label-severity {background-position: 1px -145px; background-size: 90%;}
.kanban-item-bug .label-severity[data-severity="1"] {color: #FB2B2B; background-position: 1px 2px;}
.kanban-item-bug .label-severity[data-severity="2"] {color: #FF8058; background-position: 1px -34px;}
.kanban-item-bug .label-severity[data-severity="3"] {color: #FAAE1A; background-position: 0px -72px;}
.kanban-item-bug .label-severity[data-severity="4"] {color: #B89664; background-position: 1px -108px;}
.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;}
.pri-text > .label-severity[data-severity="2"] {color: #FF8058; background-position: 2px -33px;}
.pri-text > .label-severity {background-size: 80%; background-position: 2px -130px;}
.pri-text > .label-severity[data-severity="1"] {color: #FB2B2B; background-position: 2px 1px;}
.pri-text > .label-severity[data-severity="2"] {color: #FF8058; background-position: 2px -31px;}
.pri-text > .label-severity[data-severity="3"] {color: #FAAE1A; background-position: 2px -64px;}
.pri-text > .label-severity[data-severity="4"] {color: #B89664; background-position: 2px -99px;}
.pri-text > .label-severity[data-severity="4"] {color: #B89664; background-position: 2px -97px;}
.flow-block .footerbar span.label-success {background-color: #0DBB7D;}
.flow-block .footerbar span.label-default {background-color: #9EA3B0;}