diff --git a/module/kanban/view/viewarchivedcard.html.php b/module/kanban/view/viewarchivedcard.html.php index 2c4c142e36..41efc5d7bc 100644 --- a/module/kanban/view/viewarchivedcard.html.php +++ b/module/kanban/view/viewarchivedcard.html.php @@ -62,6 +62,7 @@ $app->loadLang('execution'); $app->loadLang('release'); $app->loadLang('build'); $app->loadLang('productplan'); +if($this->config->edition != 'open') $app->loadLang('ticket'); js::set('systemMode', $this->config->systemMode); ?>
@@ -103,7 +104,12 @@ js::set('systemMode', $this->config->systemMode); title) ? $card->title : $card->name; - $delayed = ($card->fromType == 'execution' and !empty($card->delay)) ? "{$lang->execution->delayed}" : ''; + $delayed = ''; + if($card->fromType == 'execution' or $card->fromType == 'ticket') + { + $delayed = (!empty($card->delay) or (!helper::isZeroDate($card->deadline) and helper::now() > $card->deadline)) ? "{$lang->execution->delayed}" : ''; + } + if(common::hasPriv($card->fromType, 'view')) echo "
" . html::a($this->createLink($card->fromType, 'view', "id=$card->fromID"), $name, '', " title='$name'") . "$delayed
"; if(!common::hasPriv($card->fromType, 'view')) echo "
$name
$delayed
"; if($card->fromType == 'productplan' or $card->fromType == 'build') @@ -128,6 +134,9 @@ js::set('systemMode', $this->config->systemMode); begin) and !helper::isZeroDate($card->end) and $card->begin != '2030-01-01' and $card->end != '2030-01-01' and $card->fromType != ''):?> begin)) . ' ' . $lang->{$card->fromType}->to . ' ' . date("m-d", strtotime($card->end));?> + fromType == 'ticket' and !helper::isZeroDate($card->deadline) and $card->begin != '2030-01-01' and $card->end != '2030-01-01'):?> + deadline)) . ' ' . $lang->kanbancard->deadlineAB;?> + begin == '2030-01-01' or $card->end == '2030-01-01') echo '' . $lang->{$card->fromType}->future . ''; @@ -135,6 +144,7 @@ js::set('systemMode', $this->config->systemMode); if($card->fromType == 'execution') $assignedToList = $card->PM; if($card->fromType == 'build') $assignedToList = $card->builder; if($card->fromType == 'release' or $card->fromType == 'productplan') $assignedToList = $card->createdBy; + if($card->fromType == 'ticket') $assignedToList = $card->assignedTo; $count = 0; $members = ''; ?> @@ -219,6 +229,7 @@ $(function() if($item.children('.build').length) icon = ''; if($item.children('.productplan').length) icon = ''; if($item.children('.release').length) icon = ''; + if($item.children('.ticket').length) icon = ''; if($item.children('.execution').length && systemMode == 'new') icon = ''; if($item.children('.execution').length && systemMode == 'classic') icon = '';