Merge branch 'sprint/193_leiyong_bug_22913' into 'master'
* Fix bug#22912. See merge request easycorp/zentaopms!3602
This commit is contained in:
@@ -184,11 +184,10 @@ function renderProjectItem(item, $item)
|
||||
$title = $('<div class="title" />');
|
||||
}
|
||||
$title.appendTo($item);
|
||||
if(item.delay) $title.after(" <div><span class='label label-danger label-badge'>" + delayText + "</span></div>");
|
||||
}
|
||||
$title.text(item.name).attr('title', item.name);
|
||||
|
||||
if(item.delay) $title.after(" <div><span class='label label-danger label-badge'>" + delayText + "</span></div>");
|
||||
|
||||
if(item.status === 'doing')
|
||||
{
|
||||
var $progress = $item.find('.ring');
|
||||
@@ -218,6 +217,7 @@ function renderProjectItem(item, $item)
|
||||
function renderExecutionItem(item, $item)
|
||||
{
|
||||
var $title = $item.find('.title');
|
||||
|
||||
if(!$title.length)
|
||||
{
|
||||
if((item.type == 'kanban' && window.userPrivs.kanban) || (item.type != 'kanban' && window.userPrivs.execution))
|
||||
@@ -233,11 +233,10 @@ function renderExecutionItem(item, $item)
|
||||
$title = $('<div class="title" />');
|
||||
}
|
||||
$title.appendTo($item);
|
||||
if(item.delay) $title.after(" <div><span class='label label-danger label-badge'>" + delayText + "</span></div>");
|
||||
}
|
||||
$title.text(item.name).attr('title', item.name);
|
||||
|
||||
if(item.delay) $title.after(" <div><span class='label label-danger label-badge'>" + delayText + "</span></div>");
|
||||
|
||||
if(window.statusColorList && window.statusColorList[item.status])
|
||||
{
|
||||
$item.css('borderLeftColor', window.statusColorList[item.status]);
|
||||
|
||||
Reference in New Issue
Block a user