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

Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284

Browse Source
This commit is contained in:
Yagami
2023-02-08 10:24:24 +08:00
parent 3673d7f4b0 e3473f4f11
commit cbb41cb5aa
6 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+1 -1
View File
@@ -1664,7 +1664,7 @@ class executionModel extends model
elseif($param === 'hasParentName')
{
$parentExecutions = $this->dao->select('id,name')->from(TABLE_EXECUTION)->where('id')->in(trim($execution->path, ','))->andWhere('type')->in('stage,kanban,sprint')->orderBy('grade')->fetchPairs();
$executions[$execution->id]->name = implode('/', $parentExecutions);
$executions[$execution->id]->title = implode('/', $parentExecutions);
}
else
{
module/kanban/js/view.js
+4 -2
View File
@@ -472,6 +472,7 @@ function renderExecutionItem(item, $item)
].join('')).appendTo($item);
var $titleBox = $header.children('.executionName');
debugger
if(!$titleBox.length) $titleBox = $(
[
'<div class="executionName">',
@@ -480,7 +481,8 @@ function renderExecutionItem(item, $item)
/* Print execution name. */
var $title = $titleBox.children('.title');
var name = item.title ? item.title : item.name;
var name = item.name ? item.name : item.title;
var title = item.title ? item.title : name;
if(!$title.length)
{
var icon = mode == 'ALM' ? 'run' : 'project';
@@ -492,7 +494,7 @@ function renderExecutionItem(item, $item)
{
$title.append('<i class="icon icon-run"></i>' + item.title);
}
$title.attr('title', name);
$title.attr('title', title);
if(item.delay)
{
module/kanban/model.php
+2 -2
View File
@@ -1282,8 +1282,8 @@ class kanbanModel extends model
$objectCard->execType = $object->type;
$objectCard->progress = isset($executionProgress[$objectID]->progress) ? $executionProgress[$objectID]->progress : 0;
$parentExecutions = $this->dao->select('id,name')->from(TABLE_EXECUTION)->where('id')->in(trim($object->path, ','))->andWhere('type')->in('stage,kanban,sprint')->orderBy('grade')->fetchPairs();
$objectCard->name = implode('/', $parentExecutions);
$parentExecutions = $this->dao->select('id,name')->from(TABLE_EXECUTION)->where('id')->in(trim($object->path, ','))->andWhere('type')->in('stage,kanban,sprint')->orderBy('grade')->fetchPairs();
$objectCard->title = implode('/', $parentExecutions);
}
$objectCard->desc = strip_tags(htmlspecialchars_decode($object->desc));
module/kanban/view/importexecution.html.php
+2 -2
View File
@@ -62,11 +62,11 @@
<?php printf('%03d', $execution->id);?>
</td>
<?php if(common::hasPriv('execution', 'view')):?>
<td title='<?php echo $execution->name;?>'>
<td title='<?php echo $execution->title;?>'>
<a href='javascript:void(0);' onclick="locateView('execution', <?php echo $execution->id;?>)"><?php echo $execution->name;?></a>
</td>
<?php else:?>
<td title='<?php echo $execution->name;?>'><?php echo $execution->name;?></td>
<td title='<?php echo $execution->title;?>'><?php echo $execution->name;?></td>
<?php endif;?>
<td title='<?php echo zget($lang->execution->statusList, $execution->status);?>'><?php echo zget($lang->execution->statusList, $execution->status);?></td>
<td title='<?php echo zget($users, $execution->PM);?>'><?php echo zget($users, $execution->PM);?></td>
module/kanban/view/viewarchivedcard.html.php
+4 -3
View File
@@ -105,15 +105,16 @@ js::set('systemMode', $this->config->systemMode);
<?php if($card->estimate and $card->estimate != 0) echo "<span class='text-gray'>{$card->estimate}h</span>";?>
<?php else:?>
<?php
$name = isset($card->title) ? $card->title : $card->name;
$name = isset($card->name) ? $card->name : $card->title;
$title = isset($card->title) ? $card->title : $name;
$delayed = '';
if($card->fromType == 'execution' or $card->fromType == 'ticket')
{
$delayed = (!empty($card->delay) or (!helper::isZeroDate($card->deadline) and helper::now() > $card->deadline)) ? "<span class='delayed label label-danger label-badge'>{$lang->execution->delayed}</span>" : '';
}
if(common::hasPriv($card->fromType, 'view')) echo "<div class='cardName {$card->fromType}Name'>" . html::a($this->createLink($card->fromType, 'view', "id=$card->fromID"), $name, '', " title='$name'") . "$delayed</div>";
if(!common::hasPriv($card->fromType, 'view')) echo "<div class='cardName {$card->fromType}Name'><div title='$name'>$name</div>$delayed</div>";
if(common::hasPriv($card->fromType, 'view')) echo "<div class='cardName {$card->fromType}Name'>" . html::a($this->createLink($card->fromType, 'view', "id=$card->fromID"), $name, '', " title='$title'") . "$delayed</div>";
if(!common::hasPriv($card->fromType, 'view')) echo "<div class='cardName {$card->fromType}Name'><div title='$title'>$name</div>$delayed</div>";
if($card->fromType == 'productplan' or $card->fromType == 'build')
{
echo "<div class='desc' title='$card->desc'>$card->desc</div>";
module/repo/model.php
+1 -1
View File
@@ -2206,7 +2206,7 @@ class repoModel extends model
$parents = $this->dao->select('distinct parent,parent')->from(TABLE_EXECUTION)->where('type')->eq('stage')->andWhere('grade')->gt(1)->andWhere('deleted')->eq(0)->fetchPairs();
foreach($executions as $execution)
{
if(!empty($parents[$execution->id])) continue;
if(!empty($parents[$execution->id]) or ($execution->type == 'stage' and in_array($execution->attribute, array('request', 'design', 'review')) !== 'false')) continue;
if($execution->type == 'stage' and $execution->grade > 1)
{