From be0fcfaceee06af70eee451be012e3d31286d222 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 3 Dec 2024 14:42:05 +0800 Subject: [PATCH] * [task#133225,doing,1h] compatible pop-up loading. --- lib/zin/func.php | 1 + module/common/lang/de.php | 1 + module/common/lang/en.php | 1 + module/common/lang/fr.php | 1 + module/common/lang/zh-cn.php | 1 + module/execution/js/managemembers.ui.js | 10 +++++----- module/execution/lang/de.php | 1 + module/execution/lang/en.php | 1 + module/execution/lang/fr.php | 1 + module/execution/lang/zh-cn.php | 1 + module/execution/ui/managemembers.html.php | 3 ++- 11 files changed, 16 insertions(+), 6 deletions(-) diff --git a/lib/zin/func.php b/lib/zin/func.php index f587bb850e..9ad3894d70 100644 --- a/lib/zin/func.php +++ b/lib/zin/func.php @@ -247,6 +247,7 @@ function pivotTable(): pivotTable {return createWg('pivotTable', func_get_args() function pivotConfig(): pivotConfig {return createWg('pivotConfig', func_get_args());} function iconPicker(): iconPicker {return createWg('iconPicker', func_get_args());} function relatedObjectList(): relatedObjectList {return createWg('relatedObjectList', func_get_args());} +function taskAssignedTo(): taskAssignedTo {return createWg('taskAssignedTo', func_get_args());} if(is_dir(__DIR__ . DS . 'wg' . DS . 'schedule')) { diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 01e31e1cb0..33736c19aa 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -167,6 +167,7 @@ $lang->shortcutOperation = 'Quick Start'; $lang->select = 'Auswählen'; $lang->selectAll = 'Alle'; +$lang->cancelSelect = 'Cancel Select'; $lang->selectReverse = 'Auswahl umkehren'; $lang->loading = 'Lade...'; $lang->notFound = 'Nicht gefunden!'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index e0a9a09ad8..74e0dbed5d 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -167,6 +167,7 @@ $lang->shortcutOperation = 'Quick Start'; $lang->select = 'Select'; $lang->selectAll = 'Select All'; +$lang->cancelSelect = 'Cancel Select'; $lang->selectReverse = 'Select Inverse'; $lang->loading = 'Loading...'; $lang->notFound = 'Not found!'; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 6648f74b91..4ed4577192 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -167,6 +167,7 @@ $lang->shortcutOperation = 'Quick Start'; $lang->select = 'Sélectionner'; $lang->selectAll = 'Tout sélectionner'; +$lang->cancelSelect = 'Cancel Select'; $lang->selectReverse = "Sélectionner l'inverse"; $lang->loading = 'Chargement...'; $lang->notFound = 'Non trouvé !'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 54a19e8766..cd2b6b8140 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -167,6 +167,7 @@ $lang->shortcutOperation = '快捷操作'; $lang->select = '选择'; $lang->selectAll = '全选'; +$lang->cancelSelect = '取消选择'; $lang->selectReverse = '反选'; $lang->loading = '稍候...'; $lang->notFound = '抱歉，您访问的对象不存在！'; diff --git a/module/execution/js/managemembers.ui.js b/module/execution/js/managemembers.ui.js index d75caf9b71..31098a48db 100644 --- a/module/execution/js/managemembers.ui.js +++ b/module/execution/js/managemembers.ui.js @@ -37,9 +37,9 @@ window.deleteItem = function(obj) */ window.setDeptUsers = function() { - const dept = $('input[name=dept]').val(); // Get dept ID. + const dept = $('#featureBar input[name=dept]').val(); // Get dept ID. const link = $.createLink('execution', 'manageMembers', 'executionID=' + executionID + '&team2Import=' + team2Import + '&dept=' + dept); // Create manageMembers link. - loadPage(link); + isInModal ? loadModal(link) : loadPage(link); } /** @@ -51,10 +51,10 @@ window.setDeptUsers = function() */ function choseTeam2Copy() { - const team = $('input[name=execution]').val(); - const dept = $('input[name=dept]').val(); + const team = $('#featureBar input[name=execution]').val(); + const dept = $('#featureBar input[name=dept]').val(); const link = $.createLink('execution', 'manageMembers', 'executionID=' + executionID + '&team2Import=' + team + '&dept=' + dept); - loadPage(link); + isInModal ? loadModal(link) : loadPage(link); } /** diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index 6d255bdb6d..e0207315a8 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -275,6 +275,7 @@ $lang->execution->batchEdit = "Mehere bearbeiten"; $lang->execution->batchEditAction = "Batch Edit"; $lang->execution->batchChangeStatus = "Batch Change Status"; $lang->execution->manageMembers = 'Teams verwalten'; +$lang->execution->manageTeamMember = 'Manage Team Member'; $lang->execution->unlinkMember = 'Mitgliefer entfernen'; $lang->execution->unlinkStory = 'Story entfernen'; $lang->execution->unlinkStoryAB = 'Unlink'; diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index 1fdd9cf4c4..9e95761361 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -275,6 +275,7 @@ $lang->execution->batchEdit = "Edit"; $lang->execution->batchEditAction = "Batch Edit"; $lang->execution->batchChangeStatus = "Batch Change Status"; $lang->execution->manageMembers = 'Manage Team'; +$lang->execution->manageTeamMember = 'Manage Team Member'; $lang->execution->unlinkMember = 'Remove Member'; $lang->execution->unlinkStory = 'Unlink Story'; $lang->execution->unlinkStoryAB = 'Unlink'; diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index 115adfa40d..559cb51276 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -275,6 +275,7 @@ $lang->execution->batchEdit = "Edit"; $lang->execution->batchEditAction = "Batch Edit"; $lang->execution->batchChangeStatus = "Batch Change Status"; $lang->execution->manageMembers = 'Manage Team'; +$lang->execution->manageTeamMember = 'Manage Team Member'; $lang->execution->unlinkMember = 'Remove Member'; $lang->execution->unlinkStory = 'Unlink Story'; $lang->execution->unlinkStoryAB = 'Unlink'; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index 683000f48e..7f6a3ec36f 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -275,6 +275,7 @@ $lang->execution->batchEdit = "编辑"; $lang->execution->batchEditAction = "批量编辑"; $lang->execution->batchChangeStatus = "批量修改状态"; $lang->execution->manageMembers = '团队管理'; +$lang->execution->manageTeamMember = '维护团队成员'; $lang->execution->unlinkMember = '移除成员'; $lang->execution->unlinkStory = "移除{$lang->SRCommon}"; $lang->execution->unlinkStoryAB = "移除{$lang->SRCommon}"; diff --git a/module/execution/ui/managemembers.html.php b/module/execution/ui/managemembers.html.php index 1ec9e807e1..335590d670 100644 --- a/module/execution/ui/managemembers.html.php +++ b/module/execution/ui/managemembers.html.php @@ -14,6 +14,7 @@ jsVar('users', $users); jsVar('roles', $roles); jsVar('team2Import', $team2Import); jsVar('executionID', $execution->id); +jsVar('isInModal', isInModal()); /* zin: Define the set::module('team') feature bar on main menu. */ $copyTeamBox = ''; @@ -263,7 +264,7 @@ div toggle::tooltip(array('title' => $lang->execution->limitedTip)), 'help' ), - set::width('96px') + set::width('120px') ), h::th (