From 8f969074e62fbfc25e00d349d913049f00096258 Mon Sep 17 00:00:00 2001 From: liugang Date: Mon, 8 Jan 2024 10:55:37 +0800 Subject: [PATCH] * Display the module component with modulePicker widget. --- module/bug/ui/create.html.php | 38 ++++-------------------------- module/bug/ui/edit.html.php | 32 ++++--------------------- module/story/ui/create.html.php | 30 ++++------------------- module/story/ui/edit.html.php | 17 ++++--------- module/testcase/ui/create.html.php | 38 ++++-------------------------- module/testcase/ui/edit.html.php | 32 ++++--------------------- module/tree/control.php | 2 +- 7 files changed, 25 insertions(+), 164 deletions(-) diff --git a/module/bug/ui/create.html.php b/module/bug/ui/create.html.php index 71618b73e7..4a372b4094 100644 --- a/module/bug/ui/create.html.php +++ b/module/bug/ui/create.html.php @@ -110,41 +110,11 @@ formPanel set::width('1/2'), set::label($lang->bug->module), set::required(strpos(",{$config->bug->create->requiredFields},", ',module,') !== false), - inputGroup + modulePicker ( - setID('moduleBox'), - picker - ( - set::name('module'), - set::items($moduleOptionMenu), - set::value($bug->moduleID), - set::required('true') - ), - count($moduleOptionMenu) == 1 ? span - ( - setClass('input-group-addon'), - a - ( - setClass('mr-2'), - set('href', $this->createLink('tree', 'browse', "rootID=$bug->productID&view=bug¤tModuleID=0&branch={$bug->branch}")), - setData - ( - array - ( - 'toggle' => 'modal', - 'size' => 'lg' - ) - ), - $lang->tree->manage - ), - a - ( - setID('refreshModule'), - setClass('text-black'), - set('href', 'javascript:void(0)'), - icon('refresh') - ) - ) : null + set::items($moduleOptionMenu), + set::value($bug->moduleID), + set::manageLink(createLink('tree', 'browse', "rootID={$bug->productID}&view=bug¤tModuleID=0&branch={$bug->branch}")) ) ), formGroup diff --git a/module/bug/ui/edit.html.php b/module/bug/ui/edit.html.php index cd7f97a5d4..b8b0bd386b 100644 --- a/module/bug/ui/edit.html.php +++ b/module/bug/ui/edit.html.php @@ -131,35 +131,11 @@ detailBody item ( set::name($lang->bug->module), - inputGroup + modulePicker ( - set('id', 'moduleBox'), - picker - ( - set::name('module'), - set::items($moduleOptionMenu), - set::value($bug->module), - set::required('true') - ), - count($moduleOptionMenu) == 1 ? span - ( - set('class', 'input-group-addon'), - a - ( - set('class', 'mr-2'), - set('href', $this->createLink('tree', 'browse', "rootID={$product->id}&view=bug¤tModuleID=0&branch={$bug->branch}")), - set('data-toggle', 'modal'), - set('data-size', 'lg'), - $lang->tree->manage - ), - a - ( - set('id', 'refreshModule'), - set('class', 'text-black'), - set('href', 'javascript:void(0)'), - icon('refresh') - ) - ) : null + set::items($moduleOptionMenu), + set::value($bug->module), + set::manageLink(createLink('tree', 'browse', "rootID={$product->id}&view=bug¤tModuleID=0&branch={$bug->branch}")) ) ), item diff --git a/module/story/ui/create.html.php b/module/story/ui/create.html.php index 82708ce0a2..a0e1d88278 100644 --- a/module/story/ui/create.html.php +++ b/module/story/ui/create.html.php @@ -65,33 +65,11 @@ formPanel ( set::label($lang->story->module), set::required(strpos(",{$this->config->story->create->requiredFields},", ",module,") !== false), - inputGroup + modulePicker ( - setID('moduleIdBox'), - picker - ( - set::name('module'), - set::name('module'), - set::items($fields['module']['options']), - set::value($fields['module']['default']), - set::required(true) - ), - count($fields['module']['options']) == 1 ? span - ( - setClass('input-group-addon'), - a - ( - setClass('mr-2'), - set('href', $this->createLink('tree', 'browse', "rootID=$productID&view=story¤tModuleID=0&branch={$branch}")), - setData(array('toggle' => 'modal', 'size' => 'lg')), - $lang->tree->manage - ), - a - ( - set('onclick', "loadProductModules({$productID})"), - icon('refresh') - ) - ) : null + set::items($fields['module']['options']), + set::value($fields['module']['default']), + set::manageLink(createLink('tree', 'browse', "rootID={$productID}&view=story¤tModuleID=0&branch={$branch}")) ) ) ), diff --git a/module/story/ui/edit.html.php b/module/story/ui/edit.html.php index 56cf75a9e9..aff84fe916 100644 --- a/module/story/ui/edit.html.php +++ b/module/story/ui/edit.html.php @@ -229,20 +229,11 @@ detailBody item ( set::name($lang->story->module), - inputGroup + modulePicker ( - span - ( - setID('moduleIdBox'), - picker - ( - set::name('module'), - set::items($fields['module']['options']), - set::value($fields['module']['default']) - ) - ), - count($moduleOptionMenu) == 1 ? btn(set::url($this->createLink('tree', 'browse', "rootID={$story->product}&view=story¤tModuleID=0&branch={$story->branch}")), setData(array('toggle' => 'modal')), $lang->tree->manage) : null, - count($moduleOptionMenu) == 1 ? btn(set('onclick', "loadProductModules({$story->product})"), setClass('refresh'), icon('refresh')) : null + set::items($fields['module']['options']), + set::value($fields['module']['default']), + set::manageLink(createLink('tree', 'browse', "rootID={$story->product}&view=story¤tModuleID=0&branch={$story->branch}")) ) ), $story->parent >= 0 && $story->type == 'story' && $app->tab == 'product' ? item diff --git a/module/testcase/ui/create.html.php b/module/testcase/ui/create.html.php index 41663d8a6c..421b6e0250 100644 --- a/module/testcase/ui/create.html.php +++ b/module/testcase/ui/create.html.php @@ -66,41 +66,11 @@ formPanel set::width('1/3'), set::label($lang->testcase->module), set::required(strpos(",{$config->testcase->create->requiredFields},", ',module,') !== false), - inputGroup + modulePicker ( - setID('moduleBox'), - picker - ( - setID('module'), - set::name('module'), - set::items($moduleOptionMenu), - set::value($currentModuleID), - set::required(true) - ), - span - ( - setClass('input-group-addon' . (count($moduleOptionMenu) > 1 ? ' hidden' : '')), - a - ( - setClass('mr-2'), - set('href', $this->createLink('tree', 'browse', "rootID=$productID&view=case¤tModuleID=0&branch={$branch}")), - setData - ( - array( - 'toggle' => 'modal', - 'size' => 'lg' - ) - ), - $lang->tree->manage - ), - a - ( - setID('refreshModule'), - setClass('text-black'), - set('href', 'javascript:void(0)'), - icon('refresh') - ) - ) + set::items($moduleOptionMenu), + set::value($currentModuleID), + set::manageLink(createLink('tree', 'browse', "rootID=$productID&view=case¤tModuleID=0&branch={$branch}")) ) ) ), diff --git a/module/testcase/ui/edit.html.php b/module/testcase/ui/edit.html.php index a07742d7e8..6aad972b3e 100644 --- a/module/testcase/ui/edit.html.php +++ b/module/testcase/ui/edit.html.php @@ -201,35 +201,11 @@ detailBody set::required(strpos(",{$this->config->testcase->edit->requiredFields},", ",module,") !== false), formGroup ( - inputGroup + modulePicker ( - setID('moduleIdBox'), - picker - ( - setID('module'), - set::name('module'), - set::items($moduleOptionMenu), - set::value($case->module), - set::required(true) - ), - span - ( - set('class', 'input-group-addon' . (count($moduleOptionMenu) > 1 ? ' hidden' : '')), - a - ( - set('class', 'mr-2'), - set('href', $createModuleLink), - set('data-toggle', 'modal'), - set('data-size', 'lg'), - $lang->tree->manage - ), - a - ( - set('id', 'refresh'), - set('class', 'text-black'), - icon('refresh') - ) - ) + set::items($moduleOptionMenu), + set::value($case->module), + set::manageLink(createLink('tree', 'browse', "rootID={$rootID}&view={$viewType}¤tModuleID=0&branch={$case->branch}")) ) ) ), diff --git a/module/tree/control.php b/module/tree/control.php index a6be4c0294..3c4d798d79 100644 --- a/module/tree/control.php +++ b/module/tree/control.php @@ -258,7 +258,7 @@ class tree extends control if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'idList' => $moduleIDList)); if(isInModal()) { - return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "loadProductModules($rootID);")); + return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "renderModulePicker($rootID, '$viewType');")); } return $this->sendSuccess(array('load' => true));