Merge branch 'sprint/185_zhangzilong_49280' into 'sprint/185'

* Finish task #49280.

See merge request easycorp/zentaopms!1936
This commit is contained in:
孙广明
2022-02-24 02:46:43 +00:00
2 changed files with 4 additions and 1 deletions

View File

@@ -19,7 +19,7 @@
#kanbanList .kanban-header {position: relative;}
#kanbanList .kanban-item.link-block {padding: 0;}
#kanbanList .kanban-item.link-block a {padding: 10px; display: block;}
#kanbanList .kanban-card {display: grid;}
#kanbanList .kanban-card {display: flex;}
#kanbanList .kanban-card > .title {white-space: nowrap; overflow: hidden; text-overflow: ellipsis;}
#kanbanList .kanban-card.has-progress {padding-right: 40px; position: relative;}
#kanbanList .kanban-card.has-progress > .progress-pie,
@@ -179,6 +179,8 @@ function renderProjectItem(item, $item)
}
$title.text(item.name).attr('title', item.name);
if(item.delay) $title.after("&nbsp;<div><span class='label label-danger label-badge'>" + delayText + "</span></div>")
if(item.status === 'doing')
{
var $progress = $item.find('.ring');

View File

@@ -44,6 +44,7 @@ js::set('kanbanGroup', $kanbanGroup);
js::set('latestExecutions', $latestExecutions);
js::set('programPairs', $programPairs);
js::set('doingText', $lang->project->statusList['doing']);
js::set('delayText', $lang->project->statusList['delay']);
js::set('priv',
array(
'canStart' => common::hasPriv('project', 'start'),