diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js index e7192cbed5..43b458c1eb 100644 --- a/module/execution/js/taskkanban.js +++ b/module/execution/js/taskkanban.js @@ -288,7 +288,7 @@ function renderTaskItem(item, $item, col) var priHtml = '' + item.pri + ''; var hoursHtml = scaleSize <= 1 && item.status != 'wait' ? ('' + taskLang.leftAB + ' ' + item.left + 'h') : ('' + taskLang.estimateAB + ' ' + item.estimate + 'h'); var avatarHtml = ''; - if(item.assignedTo == '' && item.mode == 'multi') avatarHtml = renderUserAvatar({title: item.assignedMembers, realname: iconTeam}, 'task', item.id, '', col.type); + if(item.assignedTo == '' && item.mode == 'multi') avatarHtml = renderUserAvatar({title: item.teamMembers, realname: teamWords}, 'task', item.id, '', col.type); else avatarHtml = renderUserAvatar(item.assignedTo, 'task', item.id, '', col.type); var $infos = $item.find('.infos'); if(!$infos.length) $infos = $('
'); diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index 0d0f5fbd7e..48973a57cf 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -478,7 +478,7 @@ $lang->execution->kanbanViewList['story'] = "{$lang->SRCommon}"; $lang->execution->kanbanViewList['bug'] = 'Bug'; $lang->execution->kanbanViewList['task'] = 'Task'; -$lang->execution->iconTeam = 'Team'; +$lang->execution->teamWords = 'Team'; $lang->kanbanSetting = new stdclass(); $lang->kanbanSetting->noticeReset = 'Möchten Sie die Einstellungen des Kanbans zurücksetzen?'; diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index 220e646a7d..45d52cf3bc 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -478,7 +478,7 @@ $lang->execution->kanbanViewList['story'] = "{$lang->SRCommon}"; $lang->execution->kanbanViewList['bug'] = 'Bug'; $lang->execution->kanbanViewList['task'] = 'Task'; -$lang->execution->iconTeam = 'Team'; +$lang->execution->teamWords = 'Team'; $lang->kanbanSetting = new stdclass(); $lang->kanbanSetting->noticeReset = 'Do you want to reset Kanban?'; diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index 550fa7556d..5b39ac9731 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -478,7 +478,7 @@ $lang->execution->kanbanViewList['story'] = "{$lang->SRCommon}"; $lang->execution->kanbanViewList['bug'] = 'Bug'; $lang->execution->kanbanViewList['task'] = 'Task'; -$lang->execution->iconTeam = 'Team'; +$lang->execution->teamWords = 'Team'; $lang->kanbanSetting = new stdclass(); $lang->kanbanSetting->noticeReset = 'Voulez-vous réinitialiser le tableau Kanban ?'; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index 09f48080d5..3ff779523e 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -478,7 +478,7 @@ $lang->execution->kanbanViewList['story'] = "{$lang->SRCommon}看板"; $lang->execution->kanbanViewList['bug'] = 'Bug看板'; $lang->execution->kanbanViewList['task'] = '任务看板'; -$lang->execution->iconTeam = '团队'; +$lang->execution->teamWords = '团队'; $lang->kanbanSetting = new stdclass(); $lang->kanbanSetting->noticeReset = '是否恢复看板默认设置?'; diff --git a/module/execution/lang/zh-tw.php b/module/execution/lang/zh-tw.php index 05ba21bbf9..7f5baf81ea 100644 --- a/module/execution/lang/zh-tw.php +++ b/module/execution/lang/zh-tw.php @@ -453,6 +453,6 @@ $lang->execution->statusColorList['doing'] = '#0BD986'; $lang->execution->statusColorList['suspended'] = '#fdc137'; $lang->execution->statusColorList['closed'] = '#838A9D'; -$lang->execution->iconTeam = '團隊'; +$lang->execution->teamWords = '團隊'; $lang->execution->boardColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#FF8F26', '#7FBB00', '#424BAC', '#66c5f8', '#EC2761'); diff --git a/module/execution/view/taskkanban.html.php b/module/execution/view/taskkanban.html.php index 82f91e7280..847dee3671 100644 --- a/module/execution/view/taskkanban.html.php +++ b/module/execution/view/taskkanban.html.php @@ -231,5 +231,5 @@ js::set('priv', config->minColWidth);?> config->maxColWidth);?> -execution->iconTeam);?> +execution->teamWords);?> diff --git a/module/kanban/model.php b/module/kanban/model.php index 4e8773e766..a36be67f92 100755 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -1514,7 +1514,7 @@ class kanbanModel extends model $cardData['mode'] = $object->mode; if($object->mode == 'multi') { - $cardData['assignedMembers'] = $object->assignedMembers; + $cardData['teamMembers'] = $object->teamMembers; } } else diff --git a/module/task/model.php b/module/task/model.php index 13b9baf141..960a8cd295 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -3208,12 +3208,12 @@ class taskModel extends model if($task->mode == 'multi') { - $assignedMembers = $this->dao->select('t1.realname')->from(TABLE_USER)->alias('t1') + $teamMembers = $this->dao->select('t1.realname')->from(TABLE_USER)->alias('t1') ->leftJoin(TABLE_TASKTEAM)->alias('t2') ->on('t1.account = t2.account') ->where('t2.task')->eq($task->id) ->fetchPairs(); - $task->assignedMembers= join(',', array_keys($assignedMembers)); + $task->teamMembers= join(',', array_keys($teamMembers)); } return $task;