From fe8b92b7e90bb8a55d137e2eb41a1bae09541e9b Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 13 Jun 2023 09:33:07 +0800 Subject: [PATCH] * Refactor, change the config of the link. --- module/build/config/dtable.php | 6 +++--- module/design/config/dtable.php | 4 ++-- module/execution/config/dtable.php | 2 +- module/project/config/dtable.php | 6 +++--- module/release/config/dtable.php | 4 ++-- module/task/config/dtable.php | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/module/build/config/dtable.php b/module/build/config/dtable.php index 38b3e52601..35bb6d8db7 100644 --- a/module/build/config/dtable.php +++ b/module/build/config/dtable.php @@ -10,7 +10,7 @@ $config->build->dtable->fieldList['id']['type'] = 'id'; $config->build->dtable->fieldList['name']['title'] = $lang->build->nameAB; $config->build->dtable->fieldList['name']['name'] = 'name'; -$config->build->dtable->fieldList['name']['link'] = helper::createLink('build', 'view', 'buildID={id}'); +$config->build->dtable->fieldList['name']['link'] = array('module' => 'build', 'method' => 'view', 'params' => 'buildID={id}'); $config->build->dtable->fieldList['name']['type'] = 'title'; $config->build->dtable->fieldList['name']['sortType'] = false; @@ -65,7 +65,7 @@ $config->build->story->dtable->fieldList['id']['checkbox'] = true; $config->build->story->dtable->fieldList['title']['title'] = $lang->story->title; $config->build->story->dtable->fieldList['title']['name'] = 'title'; $config->build->story->dtable->fieldList['title']['type'] = 'title'; -$config->build->story->dtable->fieldList['title']['link'] = helper::createLink('story', 'view', 'storyID={id}', '', true); +$config->build->story->dtable->fieldList['title']['link'] = array('module' => 'story', 'method' => 'view', 'params' => 'storyID={id}', '', true); $config->build->story->dtable->fieldList['title']['data-toggle'] = 'modal'; $config->build->story->dtable->fieldList['pri']['title'] = $lang->priAB; @@ -109,7 +109,7 @@ $config->build->bug->dtable->fieldList['id']['sortType'] = 'desc'; $config->build->bug->dtable->fieldList['title']['title'] = $lang->bug->title; $config->build->bug->dtable->fieldList['title']['name'] = 'title'; $config->build->bug->dtable->fieldList['title']['type'] = 'title'; -$config->build->bug->dtable->fieldList['title']['link'] = helper::createLink('bug', 'view', 'bugID={id}', '', true); +$config->build->bug->dtable->fieldList['title']['link'] = array('module' => 'bug', 'method' => 'view', 'params' => 'bugID={id}'); $config->build->bug->dtable->fieldList['title']['data-toggle'] = 'modal'; $config->build->bug->dtable->fieldList['severity']['title'] = $lang->bug->severity; diff --git a/module/design/config/dtable.php b/module/design/config/dtable.php index 47a5d415ac..ccc0e3c8e3 100644 --- a/module/design/config/dtable.php +++ b/module/design/config/dtable.php @@ -6,7 +6,7 @@ $config->design->dtable->fieldList['id']['title'] = $lang->idAB; $config->design->dtable->fieldList['id']['type'] = 'id'; $config->design->dtable->fieldList['name']['type'] = 'title'; -$config->design->dtable->fieldList['name']['link'] = helper::createLink('design', 'view', 'designID={id}'); +$config->design->dtable->fieldList['name']['link'] = array('module' => 'design', 'method' => 'view', 'params' => 'designID={id}'); $config->design->dtable->fieldList['product']['type'] = 'desc'; @@ -16,7 +16,7 @@ $config->design->dtable->fieldList['type']['sortType'] = false; $config->design->dtable->fieldList['assignedTo']['type'] = 'assign'; $config->design->dtable->fieldList['assignedTo']['currentUser'] = $app->user->account; -$config->design->dtable->fieldList['assignedTo']['assignLink'] = helper::createLink('design', 'assignTo', "designID={id}", '', true); +$config->design->dtable->fieldList['assignedTo']['assignLink'] = array('module' => 'design', 'method' => 'assignTo', 'params' => 'designID={id}'); $config->design->dtable->fieldList['assignedTo']['data-toggle'] = 'modal'; $config->design->dtable->fieldList['assignedTo']['sortType'] = false; diff --git a/module/execution/config/dtable.php b/module/execution/config/dtable.php index e78851393c..af9d8a3611 100644 --- a/module/execution/config/dtable.php +++ b/module/execution/config/dtable.php @@ -137,7 +137,7 @@ $config->execution->dtable->fieldList['burn']['show'] = true; $config->execution->dtable->team->fieldList['account']['title'] = $lang->team->account; $config->execution->dtable->team->fieldList['account']['name'] = 'realname'; $config->execution->dtable->team->fieldList['account']['type'] = 'user'; -$config->execution->dtable->team->fieldList['account']['link'] = helper::createLink('user', 'view', "userID={userID}"); +$config->execution->dtable->team->fieldList['account']['link'] = array('module' => 'user', 'method' => 'view', 'params' => 'userID={userID}'); $config->execution->dtable->team->fieldList['account']['sortType'] = false; $config->execution->dtable->team->fieldList['role']['title'] = $lang->team->role; diff --git a/module/project/config/dtable.php b/module/project/config/dtable.php index 9d13349d2d..f422586abb 100644 --- a/module/project/config/dtable.php +++ b/module/project/config/dtable.php @@ -14,7 +14,7 @@ $config->project->dtable->fieldList['id']['required'] = true; $config->project->dtable->fieldList['name']['title'] = $lang->project->name; $config->project->dtable->fieldList['name']['name'] = 'name'; $config->project->dtable->fieldList['name']['type'] = 'title'; -$config->project->dtable->fieldList['name']['link'] = helper::createLink('project', 'index', 'projectID={id}'); +$config->project->dtable->fieldList['name']['link'] = array('module' => 'project', 'method' => 'index', 'params' => 'projectID={id}'); $config->project->dtable->fieldList['name']['iconRender'] = 'RAWJSRAWJS'; $config->project->dtable->fieldList['name']['group'] = 1; $config->project->dtable->fieldList['name']['required'] = true; @@ -130,7 +130,7 @@ $config->project->dtable->fieldList['actions']['actionsMap']['perm']['url'] = h $config->project->dtable->fieldList['actions']['actionsMap']['link']['icon'] = 'link'; $config->project->dtable->fieldList['actions']['actionsMap']['link']['hint'] = $lang->project->manageProducts; -$config->project->dtable->fieldList['actions']['actionsMap']['link']['url'] = helper::createLink('project', 'manageProducts', 'projectID={id}'); +$config->project->dtable->fieldList['actions']['actionsMap']['link']['url'] = array('module' => 'project', 'method' => 'manageProducts', 'params' => 'projectID={id}'); $config->project->dtable->fieldList['actions']['actionsMap']['whitelist']['icon'] = 'shield-check'; $config->project->dtable->fieldList['actions']['actionsMap']['whitelist']['hint'] = $lang->project->whitelist; @@ -343,7 +343,7 @@ $app->loadLang('execution'); $config->project->dtable->team->fieldList['account']['title'] = $lang->team->account; $config->project->dtable->team->fieldList['account']['name'] = 'realname'; $config->project->dtable->team->fieldList['account']['type'] = 'user'; -$config->project->dtable->team->fieldList['account']['link'] = helper::createLink('user', 'view', "userID={userID}"); +$config->project->dtable->team->fieldList['account']['link'] = array('module' => 'user', 'method' => 'view', 'params' => 'userID={userID}'); $config->project->dtable->team->fieldList['account']['sortType'] = false; $config->project->dtable->team->fieldList['role']['title'] = $lang->team->role; diff --git a/module/release/config/dtable.php b/module/release/config/dtable.php index 3f60d9b9ec..825ba10536 100644 --- a/module/release/config/dtable.php +++ b/module/release/config/dtable.php @@ -15,7 +15,7 @@ $config->release->dtable->fieldList['id']['type'] = 'id'; $config->release->dtable->fieldList['name']['title'] = $lang->release->name; $config->release->dtable->fieldList['name']['name'] = 'name'; -$config->release->dtable->fieldList['name']['link'] = helper::createLink('release', 'view', 'releaseID={id}'); +$config->release->dtable->fieldList['name']['link'] = array('module' => 'release', 'method' => 'view', 'params' => 'releaseID={id}'); $config->release->dtable->fieldList['name']['type'] = 'title'; $config->release->dtable->fieldList['branch']['title'] = $lang->release->branch; @@ -99,7 +99,7 @@ $config->release->dtable->bug->fieldList['id']['sortType'] = 'desc'; $config->release->dtable->bug->fieldList['title']['title'] = $lang->bug->title; $config->release->dtable->bug->fieldList['title']['name'] = 'title'; $config->release->dtable->bug->fieldList['title']['type'] = 'title'; -$config->release->dtable->bug->fieldList['title']['link'] = helper::createLink('bug', 'view', 'bugID={id}', '', true); +$config->release->dtable->bug->fieldList['title']['link'] = array('module' => 'bug', 'method' => 'view', 'params' => 'bugID={id}'); $config->release->dtable->bug->fieldList['title']['data-toggle'] = 'modal'; $config->release->dtable->bug->fieldList['severity']['title'] = $lang->bug->severity; diff --git a/module/task/config/dtable.php b/module/task/config/dtable.php index eee2f0864d..b4dbfb0158 100644 --- a/module/task/config/dtable.php +++ b/module/task/config/dtable.php @@ -13,7 +13,7 @@ $config->task->dtable->fieldList['name']['fixed'] = 'left'; $config->task->dtable->fieldList['name']['flex'] = 1; $config->task->dtable->fieldList['name']['type'] = 'nestedTitle'; $config->task->dtable->fieldList['name']['sortType'] = true; -$config->task->dtable->fieldList['name']['link'] = helper::createLink('task', 'view', 'taskID={id}'); +$config->task->dtable->fieldList['name']['link'] = array('module' => 'task', 'method' => 'view', 'params' => 'taskID={id}'); $config->task->dtable->fieldList['pri']['title'] = $lang->priAB; $config->task->dtable->fieldList['pri']['name'] = 'pri'; @@ -46,7 +46,7 @@ $config->task->dtable->fieldList['assignedTo']['title'] = $lang->task->ass $config->task->dtable->fieldList['assignedTo']['name'] = 'assignedTo'; $config->task->dtable->fieldList['assignedTo']['type'] = 'assign'; $config->task->dtable->fieldList['assignedTo']['currentUser'] = $app->user->account; -$config->task->dtable->fieldList['assignedTo']['assignLink'] = helper::createLink('task', 'assignTo', "executionID={execution}&taskID={id}", '', true); +$config->task->dtable->fieldList['assignedTo']['assignLink'] = array('module' => 'task', 'method' => 'assignTo', 'params' => 'executionID={execution}&taskID={id}'); $config->task->dtable->fieldList['assignedTo']['sortType'] = true; $config->task->dtable->fieldList['assignedDate']['title'] = $lang->task->assignedDate; @@ -216,7 +216,7 @@ $config->task->dtable->importTask->fieldList['id']['checkbox'] = true; $config->task->dtable->importTask->fieldList['name']['title'] = $lang->task->name; $config->task->dtable->importTask->fieldList['name']['name'] = 'name'; $config->task->dtable->importTask->fieldList['name']['type'] = 'nestedTitle'; -$config->task->dtable->importTask->fieldList['name']['link'] = helper::createLink('task', 'view', 'taskID={id}', '', true); +$config->task->dtable->importTask->fieldList['name']['link'] = array('module' => 'task', 'method' => 'view', 'params' => 'taskID={id}'); $config->task->dtable->importTask->fieldList['name']['data-toggle'] = 'modal'; $config->task->dtable->importTask->fieldList['pri']['title'] = $lang->priAB;