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

Merge branch 'master' into sprint/cyy_73414

Browse Source
This commit is contained in:
caoyanyi
2022-10-26 10:33:35 +08:00
parent 21e79f0b7d 8408a15586
commit 8023462ffc
18 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/router.class.php
+1 -1
View File
@@ -1015,7 +1015,7 @@ class baseRouter
session_name($sessionName);
session_set_cookie_params(0, $this->config->webRoot, '', $this->config->cookieSecure, true);
if($this->config->customSession) session_save_path($this->getTmpRoot() . 'session');
session_start();
if(!session_id()) session_start();
$this->sessionID = isset($ztSessionHandler) ? $ztSessionHandler->getSessionID() : session_id();
module/bug/view/edit.html.php
+2 -2
View File
@@ -143,7 +143,7 @@ if($this->app->tab == 'project') js::set('objectID', $bug->project);
</tr>
<tr>
<th><?php echo $lang->bug->status;?></th>
<td>
<td class='status-<?php echo $bug->status;?>'>
<?php
echo zget($lang->bug->statusList, $bug->status);
echo html::hidden('status', $bug->status);
@@ -152,7 +152,7 @@ if($this->app->tab == 'project') js::set('objectID', $bug->project);
</tr>
<tr>
<th><?php echo $lang->bug->confirmed;?></th>
<td><?php echo $lang->bug->confirmedList[$bug->confirmed];?></td>
<td class='confirm<?php echo $bug->confirmed;?>'><?php echo $lang->bug->confirmedList[$bug->confirmed];?></td>
</tr>
<tr>
<th><?php echo $lang->bug->assignedTo;?></th>
module/bug/view/view.html.php
+1 -1
View File
@@ -207,7 +207,7 @@
</tr>
<tr>
<th><?php echo $lang->bug->confirmed;?></th>
<td><?php echo $lang->bug->confirmedList[$bug->confirmed];?></td>
<td class='confirm<?php echo $bug->confirmed;?>'><?php echo $lang->bug->confirmedList[$bug->confirmed];?></td>
</tr>
<tr>
<th><?php echo $lang->bug->lblAssignedTo;?></th>
module/my/view/testcase.html.php
+1 -1
View File
@@ -94,7 +94,7 @@
<td class='c-name' title='<?php echo $case->taskName;?>'><?php echo $case->taskName;?></td>
<?php endif;?>
<td><?php echo zget($lang->testcase->typeList, $case->type);?></td>
<td class='<?php if(isset($run)) echo $run->status;?>'><?php echo $this->processStatus('testcase', $case);?></td>
<td class='status-testcase status-<?php if(isset($run)) echo $run->status;?>'><?php echo $this->processStatus('testcase', $case);?></td>
<td><?php echo zget($users, $case->openedBy);?></td>
<td><?php echo zget($users, $case->lastRunner);?></td>
<td><?php echo helper::isZeroDate($case->lastRunDate) ? '' : substr($case->lastRunDate, 5, 11);?></td>
module/project/view/view.html.php
+1 -1
View File
@@ -123,7 +123,7 @@
<?php if(isset($project->delay)):?>
<span class="label label-danger label-outline"><?php echo $lang->project->delayed;?></span>
<?php else:?>
<span class="label label-success label-outline"><?php echo $this->processStatus('project', $project);?></span>
<span class="label status-<?php echo $project->status;?> label-outline"><?php echo $this->processStatus('project', $project);?></span>
<?php endif;?>
</p>
</div>
module/task/lang/de.php
+1 -1
View File
@@ -60,9 +60,9 @@ $lang->task->replace = 'Replace';
$lang->task->myEffort = 'My Effort';
$lang->task->allEffort = 'Team Effort';
$lang->task->teamOrder = 'Order';
$lang->task->manageTeam = 'Manage Team';
$lang->task->unfoldEffort = 'Unfold Effort';
$lang->task->foldEffort = 'Fold Effort';
$lang->task->manageTeam = 'Manage Team';
$lang->task->common = 'Aufgabe';
$lang->task->id = 'ID';
module/task/lang/en.php
+1 -1
View File
@@ -60,9 +60,9 @@ $lang->task->replace = 'Replace';
$lang->task->myEffort = 'My Effort';
$lang->task->allEffort = 'Team Effort';
$lang->task->teamOrder = 'Order';
$lang->task->manageTeam = 'Manage Team';
$lang->task->unfoldEffort = 'Unfold Effort';
$lang->task->foldEffort = 'Fold Effort';
$lang->task->manageTeam = 'Manage Team';
$lang->task->common = 'Task';
$lang->task->id = 'ID';
module/task/lang/fr.php
+1 -1
View File
@@ -60,9 +60,9 @@ $lang->task->replace = 'Replace';
$lang->task->myEffort = 'My Effort';
$lang->task->allEffort = 'Team Effort';
$lang->task->teamOrder = 'Order';
$lang->task->manageTeam = 'Manage Team';
$lang->task->unfoldEffort = 'Unfold Effort';
$lang->task->foldEffort = 'Fold Effort';
$lang->task->manageTeam = 'Manage Team';
$lang->task->common = 'Tâche';
$lang->task->id = 'ID';
module/task/lang/zh-cn.php
+1 -1
View File
@@ -60,9 +60,9 @@ $lang->task->replace = '替换';
$lang->task->myEffort = '我的日志';
$lang->task->allEffort = '团队日志';
$lang->task->teamOrder = '工序';
$lang->task->manageTeam = '维护团队';
$lang->task->unfoldEffort = '展开日志';
$lang->task->foldEffort = '收起日志';
$lang->task->manageTeam = '维护团队';
$lang->task->common = '任务';
$lang->task->id = '编号';
module/testcase/view/view.html.php
+2 -2
View File
@@ -248,7 +248,7 @@
</tr>
<tr>
<th><?php echo $lang->testcase->status;?></th>
<td>
<td class='status-<?php echo $case->status;?>'>
<?php
echo $this->processStatus('testcase', $case);
if($case->version > $case->currentVersion and $from == 'testtask')
@@ -274,7 +274,7 @@
</tr>
<tr>
<th><?php echo $this->app->loadLang('testtask')->testtask->lastRunResult;?></th>
<td><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
<td class='result-testcase <?php echo $case->lastRunResult;?>'><?php echo $case->lastRunResult ? $lang->testcase->resultList[$case->lastRunResult] : $lang->testcase->unexecuted;?></td>
</tr>
<?php endif;?>
<tr>
module/testtask/css/cases.css
-3
View File
@@ -13,7 +13,4 @@ td.c-story {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
td .warning {color: red;}
#modules .active {font-weight: bolder;}
.fail .result-fail, .blocked .result-blocked {color: #f00;}
.pass .result-pass {color: green;}
.tree li > a.active {color: #0c64eb;}
module/testtask/model.php
+2 -3
View File
@@ -1498,7 +1498,7 @@ class testtaskModel extends model
if($id == 'status') $class .= $run->status;
if($id == 'title') $class .= ' text-left';
if($id == 'id') $class .= ' cell-id';
if($id == 'lastRunResult') $class .= " $run->lastRunResult";
if($id == 'lastRunResult') $class .= "result-testcase $run->lastRunResult";
if($id == 'assignedTo' && $run->assignedTo == $account) $class .= ' red';
if($id == 'actions') $class .= 'c-actions';
@@ -1595,8 +1595,7 @@ class testtaskModel extends model
break;
case 'lastRunResult':
$lastRunResultText = $run->lastRunResult ? zget($this->lang->testcase->resultList, $run->lastRunResult, $run->lastRunResult) : $this->lang->testcase->unexecuted;
$class = 'result-' . $run->lastRunResult;
echo "<span class='$class'>" . $lastRunResultText . "</span>";
echo $lastRunResultText;
break;
case 'story':
if($run->story and $run->storyTitle) echo html::a(helper::createLink('story', 'view', "storyID=$run->story"), $run->storyTitle);
module/testtask/view/view.html.php
+1 -1
View File
@@ -113,7 +113,7 @@
</tr>
<tr>
<th><?php echo $lang->testtask->status;?></th>
<td class='task-<?php echo $task->status?>'><?php echo $this->processStatus('testtask', $task);?></td>
<td class='status-testtask status-<?php echo $task->status?>'><?php echo $this->processStatus('testtask', $task);?></td>
</tr>
<tr>
<th><?php echo $lang->testtask->testreport;?></th>
module/user/view/story.html.php
+1 -1
View File
@@ -73,7 +73,7 @@
<?php endif;?>
<td><?php echo zget($users, $story->openedBy);?></td>
<td class='estimate text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
<td class='story-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></td>
<td class='status-story status-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></td>
<?php if($this->config->vision != 'lite'):?>
<td><?php echo $lang->story->stageList[$story->stage];?></td>
<?php endif;?>
module/user/view/task.html.php
+1 -1
View File
@@ -66,7 +66,7 @@
<?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', $onlybody, $task->project), $task->name, null, "class='$class' data-width='80%' style='color: $task->color' title='$task->name'");?>
</td>
<td><span class='label-pri label-pri-<?php echo $task->pri;?>'><?php echo zget($lang->task->priList, $task->pri, $task->pri);?></span></td>
<td class='<?php echo $task->status;?>'><?php echo $this->processStatus('task', $task);?></td>
<td class='status-task status-<?php echo $task->status;?>'><?php echo $this->processStatus('task', $task);?></td>
<td class='text-left nobr' title="<?php echo $task->executionName?>"><?php echo html::a($this->createLink('execution', 'browse', "executionID=$task->executionID"), $task->executionName);?></td>
<td class="deadline text-center <?php if(isset($task->delay)) echo 'delayed';?>"><?php if(substr($task->deadline, 0, 4) > 0) echo '<span>' . $task->deadline . '</span>';?></td>
<td class='hours' title="<?php echo $task->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $task->estimate . $lang->execution->workHourUnit;?></td>
module/user/view/testcase.html.php
+2 -2
View File
@@ -53,11 +53,11 @@
<td class='text-left'><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), $case->title);?></td>
<td><span class='<?php echo 'pri' . zget($lang->testcase->priList, $case->pri, $case->pri)?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
<td><?php echo $lang->testcase->typeList[$case->type];?></td>
<td class='<?php echo $case->status;?>'><?php echo $this->processStatus('testcase', $case);?></td>
<td class='status-testcase status-<?php echo $case->status;?>'><?php echo $this->processStatus('testcase', $case);?></td>
<td><?php echo zget($users, $case->openedBy);?></td>
<td><?php echo zget($users, $case->lastRunner);?></td>
<td><?php echo helper::isZeroDate($case->lastRunDate) ? '' : substr($case->lastRunDate, 5, 11);?></td>
<td class='<?php echo $case->lastRunResult;?>'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
<td class='result-testcase <?php echo $case->lastRunResult;?>'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
</tr>
<?php endforeach;?>
</tbody>
module/user/view/testtask.html.php
+1 -1
View File
@@ -55,7 +55,7 @@
<td class='nobr'><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></td>
<td><?php echo $task->begin?></td>
<td><?php echo $task->end?></td>
<td class='task-<?php echo $task->status?>'><?php echo $this->processStatus('testtask', $task);?></td>
<td class='status-testtask status-<?php echo $task->status?>'><?php echo $this->processStatus('testtask', $task);?></td>
</tr>
<?php endforeach;?>
</tbody>
www/theme/default/style.css
+15 -2
View File
@@ -154,6 +154,18 @@ td.delayed > span {display: inline-block; height: 20px; line-height: 18px; backg
.table.has-sort-head thead > tr > th:last-child {padding-right: 8px;}
tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-block; vertical-align: middle; background: #F4F5F7; margin: 0 4px 0 0;}
.label.label-outline.status-wait {color: #313C52; border-color: #313C52;}
.label.label-outline.status-doing {color: #FF6F42; border-color: #FF6F42;}
.label.label-outline.status-suspended {color: #B89664; border-color: #B89664;}
.label.label-outline.status-closed {color: #9EA3B0; border-color: #9EA3B0;}
.status-active .label-dot, .status-wait .label-dot {background-color: #313C52;}
.status-draft .label-dot {background-color: #8166EE;}
.status-closed .label-dot {background-color: #9EA3B0;}
.status-changing .label-dot {background-color: #FB2B2B;}
.status-doing .label-dot {background-color: #FF6F42;}
.status-done .label-dot {background-color: #0DBB7D;}
.status-pause .label-dot {background-color: #B89664;}
.status-cancel .label-dot {background-color: #B89664;}
.status-wait, .status-active, .status-active.status-bug, .status-normal, .status-asked, #workflowTable td.text-center.text-warning, .result-testcase, .c-lastRunResult span, .status-unconfirmed {color: #313C52;}
.status-doing, .status-commenting, .status-checkingi, .status-confirmed {color: #FF6F42;}
.status-suspended, .status-pause, .status-blocked, .status-hangup, .result-testcase.blocked, .c-lastRunResult .result-blocked {color: #B89664;}
@@ -161,13 +173,14 @@ tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-
.status-draft {color: #8166EE;}
.status-cancel, .status-investigate, .status-canceled {color: #838A9D;}
.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 {color: #FB2B2B;}
.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;}
.severity-issue.severity-2, .c-severity .severity-2 {color: #FF9F44;}
.severity-issue.severity-4, .c-severity .severity-3 {color: #313C52;}
.label-pri, .label-selector > .label {color: #9EA3B0; border-color: #9EA3B0;}
.label-pri-1, .label-selector>.label-pri[data-value="1"] {color: #FF4912; border-color: #FF4912;}
.label-pri-2, .label-selector>.label-pri[data-value="2"] {color: #F38F19; border-color: #F38F19;}
.label-pri-3, .label-selector>.label-pri[data-value="3"] {color: #37B2FE; border-color: #37B2FE;}
.label-pri-4, .label-selector>.label-pri[data-value="4"] {color: #9EA3B0; border-color: #9EA3B0;}
.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[data-severity="1"]:before, .label-severity[data-value="1"]:before, .label-severity[data-severity="2"]:before, .label-severity[data-value="2"]:before {content: '';}
.label-selector>.label-severity[data-severity="1"], .label-selector>.label-severity[data-value="1"], .label-selector>.label-severity[data-severity="2"], .label-selector>.label-severity[data-value="2"] {background: url('images/severity/severity-sprite.png') no-repeat; background-size:cover; border: none; height: 26px; line-height: 32px;}
.label-selector>.label-severity[data-severity="1"], .label-selector>.label-severity[data-value="1"]{background-position: 0px -1px; color: #FB2B2B;}