From 99fff4eda66eab07c73094d4c7559871fa53eaa6 Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Thu, 28 Apr 2022 10:38:08 +0800 Subject: [PATCH 1/4] * Fix bug #22028. --- extension/lite/project/ext/view/execution.html.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/extension/lite/project/ext/view/execution.html.php b/extension/lite/project/ext/view/execution.html.php index ca24aa6403..6fc9eafed7 100644 --- a/extension/lite/project/ext/view/execution.html.php +++ b/extension/lite/project/ext/view/execution.html.php @@ -94,11 +94,23 @@
id];?> + + 2) break;?> +
zget($usersAvatar, $member->account), 'account' => $member->account, 'name' => isset($member->realname) ? $member->realname : '')); ?>
+ 4):?> + … ';?> + + 3):?> + +
+ $usersAvatar[$lastMember->account], 'account' => $lastMember->account, 'name' => $lastMember->realname), 'avatar-circle avatar-' . key($lastMember)); ?> +
+
project->teamSumCount, count($teams));?>
From 32fe42bb94ed544e15e1d407dece105e1195770a Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Thu, 28 Apr 2022 10:45:30 +0800 Subject: [PATCH 2/4] * Fix bug. --- extension/lite/kanban/ext/view/view.lite.html.hook.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extension/lite/kanban/ext/view/view.lite.html.hook.php b/extension/lite/kanban/ext/view/view.lite.html.hook.php index a3351704a6..6884cd6a27 100644 --- a/extension/lite/kanban/ext/view/view.lite.html.hook.php +++ b/extension/lite/kanban/ext/view/view.lite.html.hook.php @@ -2,6 +2,6 @@ visions, ',') == 'lite'): ?> $('#headerActions').css("right", '110px'); -$('#headerActions').css("right", '190px'); +$('#headerActions').css("right", '205px'); - \ No newline at end of file + From 0b4ab42134de0f33d7eef8d307f364268331bff7 Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Thu, 28 Apr 2022 11:12:00 +0800 Subject: [PATCH 3/4] * Fix bug #22025. --- module/kanban/js/view.js | 4 ++-- module/kanban/view/view.html.php | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index 8de19f2cbd..0d0b723b39 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -1170,8 +1170,8 @@ function createColumnCreateMenu(options) if(privs.includes('createCard')) items.push({label: kanbanLang.createCard, url: $.createLink('kanban', 'createCard', 'kanbanID=' + kanbanID + '®ionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID, '', true), className: 'iframe', attrs: {'data-toggle': 'modal'}}); if(privs.includes('batchCreateCard')) items.push({label: kanbanLang.batchCreateCard, url: $.createLink('kanban', 'batchCreateCard', 'kanbanID=' + kanbanID + '®ionID=' + regionID + '&groupID=' + groupID + '&laneID=' + laneID + '&columnID=' + columnID), attrs: {'data-width': '80%'}}); if(privs.includes('import') && kanban.object.indexOf('cards') != -1) items.push({label: kanbanLang.importCard, url: $.createLink('kanban', 'importCard', 'kanbanID=' + kanbanID + '®ionID=' + regionID + '&groupID=' + groupID + '&columnID=' + columnID), className: 'iframe', attrs: {'data-toggle': 'modal'}}); - if(privs.includes('import') && kanban.object && kanban.object != 'cards') items.push({className: 'parentDivider'}); - if(privs.includes('import') && kanban.object && kanban.object != 'cards') items.push({label: kanbanLang.importAB, className: 'import'}); + if(privs.includes('import') && kanban.object && kanban.object != 'cards' && vision != 'lite') items.push({className: 'parentDivider'}); + if(privs.includes('import') && kanban.object && kanban.object != 'cards' && vision != 'lite') items.push({label: kanbanLang.importAB, className: 'import'}); return items; } diff --git a/module/kanban/view/view.html.php b/module/kanban/view/view.html.php index cbf948196f..9f960fc8e2 100644 --- a/module/kanban/view/view.html.php +++ b/module/kanban/view/view.html.php @@ -20,6 +20,7 @@ $app->loadLang('productplan'); $laneCount = 0; foreach($regions as $region) $laneCount += $region->laneCount; +js::set('vision', $this->config->vision); js::set('regions', $regions); js::set('kanban', $kanban); js::set('kanbanLang', $lang->kanban); From c04c165276f174c2820d1075da0ac74a1adc0706 Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Thu, 28 Apr 2022 13:50:48 +0800 Subject: [PATCH 4/4] * Fix bug #21429. --- module/common/view/customfield.html.php | 2 +- module/task/js/batchcreate.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/module/common/view/customfield.html.php b/module/common/view/customfield.html.php index adfed310c6..5ec1ec90dc 100644 --- a/module/common/view/customfield.html.php +++ b/module/common/view/customfield.html.php @@ -17,7 +17,7 @@ #formSettingForm .checkbox-primary {width: 50%; float: left; margin: 3px 0;} #formSetting .btn {margin-right: 8px;} - +