From f40b1db0dec2ad40e10ab0ea9b378aa31436e191 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Tue, 13 Jun 2023 09:49:56 +0800 Subject: [PATCH] * Adjust dtable config url. --- lib/zin/wg/dtable/v1.php | 20 +++++-- module/my/config/table.php | 94 ++++++++++++++++---------------- module/testtask/config/table.php | 24 ++++---- 3 files changed, 75 insertions(+), 63 deletions(-) diff --git a/lib/zin/wg/dtable/v1.php b/lib/zin/wg/dtable/v1.php index adb0442ac0..584a097e83 100644 --- a/lib/zin/wg/dtable/v1.php +++ b/lib/zin/wg/dtable/v1.php @@ -61,10 +61,22 @@ class dtable extends wg */ protected function getLink(array $setting): array|string { - if(empty($setting['module']) || empty($setting['method'])) return $setting; - if(!hasPriv($setting['module'], $setting['method'])) return ''; - - return createLink($setting['module'], $setting['method'], zget($setting, 'params', '')); + if(!empty($setting['url'])) + { + $url = $setting['url']; + if(!empty($url['module']) && !empty($url['method'])) + { + $setting['url'] = ''; + if(hasPriv($url['module'], $url['method'])) $setting['url'] = createLink($url['module'], $url['method'], zget($url, 'params', '')); + } + return $setting; + } + else if(!empty($setting['module']) && !empty($setting['method'])) + { + if(!hasPriv($setting['module'], $setting['method'])) return ''; + return createLink($setting['module'], $setting['method'], zget($setting, 'params', '')); + } + return $setting; } protected function build() diff --git a/module/my/config/table.php b/module/my/config/table.php index a1914ff614..3cfe166fbe 100644 --- a/module/my/config/table.php +++ b/module/my/config/table.php @@ -15,39 +15,39 @@ $config->my->todo->actionList = array(); $config->my->todo->actionList['start']['icon'] = 'play'; $config->my->todo->actionList['start']['text'] = $lang->todo->start; $config->my->todo->actionList['start']['hint'] = $lang->todo->start; -$config->my->todo->actionList['start']['url'] = helper::createLink('todo', 'start', 'todoID={id}'); +$config->my->todo->actionList['start']['url'] = array('module' => 'todo', 'method' => 'start', 'params' => 'todoID={id}'); $config->my->todo->actionList['activate']['icon'] = 'magic'; $config->my->todo->actionList['activate']['text'] = $lang->todo->activate; $config->my->todo->actionList['activate']['hint'] = $lang->todo->activate; -$config->my->todo->actionList['activate']['url'] = helper::createLink('todo', 'activate', 'todoID={id}'); +$config->my->todo->actionList['activate']['url'] = array('module' => 'todo', 'method' => 'activate', 'params' => 'todoID={id}'); $config->my->todo->actionList['close']['icon'] = 'off'; $config->my->todo->actionList['close']['text'] = $lang->todo->close; $config->my->todo->actionList['close']['hint'] = $lang->todo->close; -$config->my->todo->actionList['close']['url'] = helper::createLink('todo', 'close', 'todoID={id}'); +$config->my->todo->actionList['close']['url'] = array('module' => 'todo', 'method' => 'close', 'params' => 'todoID={id}'); $config->my->todo->actionList['assignTo']['icon'] = 'hand-right'; $config->my->todo->actionList['assignTo']['text'] = $lang->todo->assignedTo; $config->my->todo->actionList['assignTo']['hint'] = $lang->todo->assignedTo; -$config->my->todo->actionList['assignTo']['url'] = helper::createLink('todo', 'assignTo', 'todoID={id}'); +$config->my->todo->actionList['assignTo']['url'] = array('module' => 'todo', 'method' => 'assignTo', 'params' => 'todoID={id}'); $config->my->todo->actionList['assignTo']['data-toggle'] = 'modal'; $config->my->todo->actionList['finish']['icon'] = 'checked'; $config->my->todo->actionList['finish']['text'] = $lang->todo->finish; $config->my->todo->actionList['finish']['hint'] = $lang->todo->finish; -$config->my->todo->actionList['finish']['url'] = helper::createLink('todo', 'finish', 'todoID={id}'); +$config->my->todo->actionList['finish']['url'] = array('module' => 'todo', 'method' => 'finish', 'params' => 'todoID={id}'); $config->my->todo->actionList['edit']['icon'] = 'edit'; $config->my->todo->actionList['edit']['text'] = $lang->todo->edit; $config->my->todo->actionList['edit']['hint'] = $lang->todo->edit; -$config->my->todo->actionList['edit']['url'] = helper::createLink('todo', 'edit', 'todoID={id}'); +$config->my->todo->actionList['edit']['url'] = array('module' => 'todo', 'method' => 'edit', 'params' => 'todoID={id}'); $config->my->todo->actionList['edit']['data-toggle'] = 'modal'; $config->my->todo->actionList['delete']['icon'] = 'trash'; $config->my->todo->actionList['delete']['text'] = $lang->todo->delete; $config->my->todo->actionList['delete']['hint'] = $lang->todo->delete; -$config->my->todo->actionList['delete']['url'] = helper::createLink('todo', 'delete', 'todoID={id}&confirm=yes'); +$config->my->todo->actionList['delete']['url'] = array('module' => 'todo', 'method' => 'delete', 'params' => 'todoID={id}&confirm=yes'); $config->my->todo->dtable = new stdclass(); $config->my->todo->dtable->fieldList['id']['name'] = 'id'; @@ -57,7 +57,7 @@ $config->my->todo->dtable->fieldList['id']['type'] = 'checkID'; $config->my->todo->dtable->fieldList['name']['name'] = 'name'; $config->my->todo->dtable->fieldList['name']['title'] = $lang->todo->name; $config->my->todo->dtable->fieldList['name']['type'] = 'title'; -$config->my->todo->dtable->fieldList['name']['link'] = helper::createLink('todo', 'view', 'id={id}&from=my'); +$config->my->todo->dtable->fieldList['name']['link'] = array('module' => 'todo', 'method' => 'view', 'params' => 'id={id}&from=my'); $config->my->todo->dtable->fieldList['name']['fixed'] = 'left'; $config->my->todo->dtable->fieldList['pri']['name'] = 'pri'; @@ -148,48 +148,48 @@ $config->my->task->actionList = array(); $config->my->task->actionList['confirmStoryChange']['icon'] = 'search'; $config->my->task->actionList['confirmStoryChange']['text'] = $lang->task->confirmStoryChange; $config->my->task->actionList['confirmStoryChange']['hint'] = $lang->task->confirmStoryChange; -$config->my->task->actionList['confirmStoryChange']['url'] = helper::createLink('task', 'confirmStoryChange', 'taskID={id}'); +$config->my->task->actionList['confirmStoryChange']['url'] = array('module' => 'task', 'method' => 'confirmStoryChange', 'params' => 'taskID={id}'); $config->my->task->actionList['start']['icon'] = 'play'; $config->my->task->actionList['start']['text'] = $lang->task->start; $config->my->task->actionList['start']['hint'] = $lang->task->start; -$config->my->task->actionList['start']['url'] = helper::createLink('task', 'start', 'taskID={id}'); +$config->my->task->actionList['start']['url'] = array('module' => 'task', 'method' => 'start', 'params' => 'taskID={id}'); $config->my->task->actionList['start']['data-toggle'] = 'modal'; $config->my->task->actionList['restart']['icon'] = 'play'; $config->my->task->actionList['restart']['text'] = $lang->task->restart; $config->my->task->actionList['restart']['hint'] = $lang->task->restart; -$config->my->task->actionList['restart']['url'] = helper::createLink('task', 'restart', 'taskID={id}'); +$config->my->task->actionList['restart']['url'] = array('module' => 'task', 'method' => 'restart', 'params' => 'taskID={id}'); $config->my->task->actionList['restart']['data-toggle'] = 'modal'; $config->my->task->actionList['finish']['icon'] = 'checked'; $config->my->task->actionList['finish']['text'] = $lang->task->finish; $config->my->task->actionList['finish']['hint'] = $lang->task->finish; -$config->my->task->actionList['finish']['url'] = helper::createLink('task', 'finish', 'taskID={id}'); +$config->my->task->actionList['finish']['url'] = array('module' => 'task', 'method' => 'finish', 'params' => 'taskID={id}'); $config->my->task->actionList['finish']['data-toggle'] = 'modal'; $config->my->task->actionList['close']['icon'] = 'off'; $config->my->task->actionList['close']['text'] = $lang->task->close; $config->my->task->actionList['close']['hint'] = $lang->task->close; -$config->my->task->actionList['close']['url'] = helper::createLink('task', 'close', 'taskID={id}'); +$config->my->task->actionList['close']['url'] = array('module' => 'task', 'method' => 'close', 'params' => 'taskID={id}'); $config->my->task->actionList['close']['data-toggle'] = 'modal'; $config->my->task->actionList['record']['icon'] = 'time'; $config->my->task->actionList['record']['text'] = $lang->task->logEfforts; $config->my->task->actionList['record']['hint'] = $lang->task->logEfforts; -$config->my->task->actionList['record']['url'] = helper::createLink('task', 'recordEstimate', 'taskID={id}'); +$config->my->task->actionList['record']['url'] = array('module' => 'task', 'method' => 'recordEstimate', 'params' => 'taskID={id}'); $config->my->task->actionList['record']['data-toggle'] = 'modal'; $config->my->task->actionList['edit']['icon'] = 'edit'; $config->my->task->actionList['edit']['text'] = $lang->task->edit; $config->my->task->actionList['edit']['hint'] = $lang->task->edit; -$config->my->task->actionList['edit']['url'] = helper::createLink('task', 'edit', 'taskID={id}'); +$config->my->task->actionList['edit']['url'] = array('module' => 'task', 'method' => 'edit', 'params' => 'taskID={id}'); $config->my->task->actionList['edit']['data-toggle'] = 'modal'; $config->my->task->actionList['batchCreate']['icon'] = 'split'; $config->my->task->actionList['batchCreate']['text'] = $lang->task->batchCreate; $config->my->task->actionList['batchCreate']['hint'] = $lang->task->batchCreate; -$config->my->task->actionList['batchCreate']['url'] = helper::createLink('task', 'batchCreate', 'executionID={execution}&storyID={story}&moduleID={module}&taskID={id}iframe=true'); +$config->my->task->actionList['batchCreate']['url'] = array('module' => 'task', 'method' => 'batchCreate', 'params' => 'executionID={execution}&storyID={story}&moduleID={module}&taskID={id}iframe=true'); $config->my->task->actionList['batchCreate']['data-toggle'] = 'modal'; $config->my->task->dtable = new stdclass(); @@ -201,7 +201,7 @@ $config->my->task->dtable->fieldList['name']['name'] = 'name'; $config->my->task->dtable->fieldList['name']['title'] = $lang->task->name; $config->my->task->dtable->fieldList['name']['type'] = 'title'; $config->my->task->dtable->fieldList['name']['nestedToggle'] = true; -$config->my->task->dtable->fieldList['name']['link'] = array('url' => helper::createLink('task', 'view', 'taskID={id}'), 'data-app' => 'project'); +$config->my->task->dtable->fieldList['name']['link'] = array('url' => array('module' => 'task', 'method' => 'view', 'params' => 'taskID={id}'), 'data-app' => 'project'); $config->my->task->dtable->fieldList['name']['fixed'] = 'left'; $config->my->task->dtable->fieldList['pri']['name'] = 'pri'; @@ -219,13 +219,13 @@ $config->my->task->dtable->fieldList['status']['group'] = 'pri'; $config->my->task->dtable->fieldList['project']['name'] = 'projectName'; $config->my->task->dtable->fieldList['project']['title'] = $lang->task->project; $config->my->task->dtable->fieldList['project']['type'] = 'text'; -$config->my->task->dtable->fieldList['project']['link'] = helper::createLink('project', 'view', 'projectID={project}'); +$config->my->task->dtable->fieldList['project']['link'] = array('module' => 'project', 'method' => 'view', 'params' => 'projectID={project}'); $config->my->task->dtable->fieldList['project']['group'] = 'project'; $config->my->task->dtable->fieldList['execution']['name'] = 'executionName'; $config->my->task->dtable->fieldList['execution']['title'] = $lang->task->execution; $config->my->task->dtable->fieldList['execution']['type'] = 'text'; -$config->my->task->dtable->fieldList['execution']['link'] = helper::createLink('execution', 'task', 'executionID={execution}'); +$config->my->task->dtable->fieldList['execution']['link'] = array('module' => 'execution', 'method' => 'task', 'params' => 'executionID={execution}'); $config->my->task->dtable->fieldList['execution']['group'] = 'project'; $config->my->task->dtable->fieldList['openedBy']['name'] = 'openedBy'; @@ -275,36 +275,36 @@ $config->my->requirement->actionList = array(); $config->my->requirement->actionList['change']['icon'] = 'alter'; $config->my->requirement->actionList['change']['text'] = $lang->story->change; $config->my->requirement->actionList['change']['hint'] = $lang->story->change; -$config->my->requirement->actionList['change']['url'] = helper::createLink('story', 'change', 'storyID={id}&from=&storyType=requirement'); +$config->my->requirement->actionList['change']['url'] = array('module' => 'story', 'method' => 'change', 'params' => 'storyID={id}&from=&storyType=requirement'); $config->my->requirement->actionList['change']['data-toggle'] = 'modal'; $config->my->requirement->actionList['submitReview']['icon'] = 'confirm'; $config->my->requirement->actionList['submitReview']['text'] = $lang->story->submitReview; $config->my->requirement->actionList['submitReview']['hint'] = $lang->story->submitReview; -$config->my->requirement->actionList['submitReview']['url'] = helper::createLink('story', 'submitReview', 'storyID={id}&storyType=requirement'); +$config->my->requirement->actionList['submitReview']['url'] = array('module' => 'story', 'method' => 'submitReview', 'params' => 'storyID={id}&storyType=requirement'); $config->my->requirement->actionList['submitReview']['data-toggle'] = 'modal'; $config->my->requirement->actionList['review']['icon'] = 'search'; $config->my->requirement->actionList['review']['text'] = $lang->story->review; $config->my->requirement->actionList['review']['hint'] = $lang->story->review; -$config->my->requirement->actionList['review']['url'] = helper::createLink('story', 'review', 'storyID={id}&from=product&storyType=requirement'); +$config->my->requirement->actionList['review']['url'] = array('module' => 'story', 'method' => 'review', 'params' => 'storyID={id}&from=product&storyType=requirement'); $config->my->requirement->actionList['review']['data-toggle'] = 'modal'; $config->my->requirement->actionList['recall']['icon'] = 'undo'; $config->my->requirement->actionList['recall']['text'] = $lang->story->recall; $config->my->requirement->actionList['recall']['hint'] = $lang->story->recall; -$config->my->requirement->actionList['recall']['url'] = helper::createLink('story', 'recall', 'storyID={id}&from=list&confirm=no&storyType=requirement'); +$config->my->requirement->actionList['recall']['url'] = array('module' => 'story', 'method' => 'recall', 'params' => 'storyID={id}&from=list&confirm=no&storyType=requirement'); $config->my->requirement->actionList['edit']['icon'] = 'edit'; $config->my->requirement->actionList['edit']['text'] = $lang->story->edit; $config->my->requirement->actionList['edit']['hint'] = $lang->story->edit; -$config->my->requirement->actionList['edit']['url'] = helper::createLink('story', 'edit', 'storyID={id}&from=default&storyType=requirement'); +$config->my->requirement->actionList['edit']['url'] = array('module' => 'story', 'method' => 'edit', 'params' => 'storyID={id}&from=default&storyType=requirement'); $config->my->requirement->actionList['edit']['data-toggle'] = 'modal'; $config->my->requirement->actionList['close']['icon'] = 'off'; $config->my->requirement->actionList['close']['text'] = $lang->story->close; $config->my->requirement->actionList['close']['hint'] = $lang->story->close; -$config->my->requirement->actionList['close']['url'] = helper::createLink('story', 'close', 'storyID={id}&from=&storyType=requirement'); +$config->my->requirement->actionList['close']['url'] = array('module' => 'story', 'method' => 'close', 'params' => 'storyID={id}&from=&storyType=requirement'); $config->my->requirement->dtable = new stdclass(); $config->my->requirement->dtable->fieldList['id']['name'] = 'id'; @@ -315,7 +315,7 @@ $config->my->requirement->dtable->fieldList['title']['name'] = 'title'; $config->my->requirement->dtable->fieldList['title']['title'] = common::checkNotCN() ? $lang->URCommon . ' ' . $lang->my->name : $lang->URCommon . $lang->my->name; $config->my->requirement->dtable->fieldList['title']['type'] = 'title'; $config->my->requirement->dtable->fieldList['title']['nestedToggle'] = true; -$config->my->requirement->dtable->fieldList['title']['link'] = helper::createLink('story', 'view', 'id={id}&version=0¶m=0&storyType=requirement'); +$config->my->requirement->dtable->fieldList['title']['link'] = array('module' => 'story', 'method' => 'view', 'params' => 'id={id}&version=0¶m=0&storyType=requirement'); $config->my->requirement->dtable->fieldList['title']['fixed'] = 'left'; $config->my->requirement->dtable->fieldList['pri']['name'] = 'pri'; @@ -362,42 +362,42 @@ $config->my->story->actionList = array(); $config->my->story->actionList['change']['icon'] = 'alter'; $config->my->story->actionList['change']['text'] = $lang->story->change; $config->my->story->actionList['change']['hint'] = $lang->story->change; -$config->my->story->actionList['change']['url'] = helper::createLink('story', 'change', 'storyID={id}'); +$config->my->story->actionList['change']['url'] = array('module' => 'story', 'method' => 'change', 'params' => 'storyID={id}'); $config->my->story->actionList['change']['data-toggle'] = 'modal'; $config->my->story->actionList['submitReview']['icon'] = 'confirm'; $config->my->story->actionList['submitReview']['text'] = $lang->story->submitReview; $config->my->story->actionList['submitReview']['hint'] = $lang->story->submitReview; -$config->my->story->actionList['submitReview']['url'] = helper::createLink('story', 'submitReview', 'storyID={id}'); +$config->my->story->actionList['submitReview']['url'] = array('module' => 'story', 'method' => 'submitReview', 'params' => 'storyID={id}'); $config->my->story->actionList['submitReview']['data-toggle'] = 'modal'; $config->my->story->actionList['review']['icon'] = 'search'; $config->my->story->actionList['review']['text'] = $lang->story->review; $config->my->story->actionList['review']['hint'] = $lang->story->review; -$config->my->story->actionList['review']['url'] = helper::createLink('story', 'review', 'storyID={id}'); +$config->my->story->actionList['review']['url'] = array('module' => 'story', 'method' => 'review', 'params' => 'storyID={id}'); $config->my->story->actionList['review']['data-toggle'] = 'modal'; $config->my->story->actionList['recall']['icon'] = 'undo'; $config->my->story->actionList['recall']['text'] = $lang->story->recall; $config->my->story->actionList['recall']['hint'] = $lang->story->recall; -$config->my->story->actionList['recall']['url'] = helper::createLink('story', 'recall', 'storyID={id}'); +$config->my->story->actionList['recall']['url'] = array('module' => 'story', 'method' => 'recall', 'params' => 'storyID={id}'); $config->my->story->actionList['edit']['icon'] = 'edit'; $config->my->story->actionList['edit']['text'] = $lang->story->edit; $config->my->story->actionList['edit']['hint'] = $lang->story->edit; -$config->my->story->actionList['edit']['url'] = helper::createLink('stroy', 'edit', 'storyID={id}'); +$config->my->story->actionList['edit']['url'] = array('module' => 'stroy', 'method' => 'edit', 'params' => 'storyID={id}'); $config->my->story->actionList['edit']['data-toggle'] = 'modal'; $config->my->story->actionList['create']['icon'] = 'sitemap'; $config->my->story->actionList['create']['text'] = $lang->testcase->create; $config->my->story->actionList['create']['hint'] = $lang->testcase->create; -$config->my->story->actionList['create']['url'] = helper::createLink('testcase', 'create', 'productID={product}&branch={branch}&module=0&from=¶m=0&storyID={id}'); +$config->my->story->actionList['create']['url'] = array('module' => 'testcase', 'method' => 'create', 'params' => 'productID={product}&branch={branch}&module=0&from=¶m=0&storyID={id}'); $config->my->story->actionList['create']['data-toggle'] = 'modal'; $config->my->story->actionList['close']['icon'] = 'off'; $config->my->story->actionList['close']['text'] = $lang->story->close; $config->my->story->actionList['close']['hint'] = $lang->story->close; -$config->my->story->actionList['close']['url'] = helper::createLink('story', 'close', 'storyID={id}'); +$config->my->story->actionList['close']['url'] = array('module' => 'story', 'method' => 'close', 'params' => 'storyID={id}'); $config->my->story->dtable = new stdclass(); $config->my->story->dtable->fieldList['id']['name'] = 'id'; @@ -408,7 +408,7 @@ $config->my->story->dtable->fieldList['title']['name'] = 'title'; $config->my->story->dtable->fieldList['title']['title'] = common::checkNotCN() ? $lang->SRCommon . ' ' . $lang->my->name : $lang->SRCommon . $lang->my->name; $config->my->story->dtable->fieldList['title']['type'] = 'title'; $config->my->story->dtable->fieldList['title']['nestedToggle'] = true; -$config->my->story->dtable->fieldList['title']['link'] = helper::createLink('story', 'view', 'id={id}'); +$config->my->story->dtable->fieldList['title']['link'] = array('module' => 'story', 'method' => 'view', 'params' => 'id={id}'); $config->my->story->dtable->fieldList['title']['fixed'] = 'left'; $config->my->story->dtable->fieldList['pri']['name'] = 'pri'; @@ -464,13 +464,13 @@ $config->my->testtask->dtable->fieldList['id']['type'] = 'id'; $config->my->testtask->dtable->fieldList['title']['name'] = 'name'; $config->my->testtask->dtable->fieldList['title']['title'] = $lang->testtask->name; $config->my->testtask->dtable->fieldList['title']['type'] = 'title'; -$config->my->testtask->dtable->fieldList['title']['link'] = helper::createLink('testcase', 'view', "taskID={id}"); +$config->my->testtask->dtable->fieldList['title']['link'] = array('module' => 'testcase', 'method' => 'view', 'params' => 'taskID={id}'); $config->my->testtask->dtable->fieldList['title']['fixed'] = 'left'; $config->my->testtask->dtable->fieldList['build']['name'] = 'buildName'; $config->my->testtask->dtable->fieldList['build']['title'] = $lang->testtask->build; $config->my->testtask->dtable->fieldList['build']['type'] = 'text'; -$config->my->testtask->dtable->fieldList['build']['link'] = helper::createLink('build', 'view', "buildID={build}"); +$config->my->testtask->dtable->fieldList['build']['link'] = array('module' => 'build', 'method' => 'view', 'params' => 'buildID={build}'); $config->my->testtask->dtable->fieldList['build']['group'] = 'text'; $config->my->testtask->dtable->fieldList['execution']['name'] = 'executionName'; @@ -511,7 +511,7 @@ $config->my->testcase->dtable->fieldList['id']['fixed'] = 'left'; $config->my->testcase->dtable->fieldList['title']['name'] = 'title'; $config->my->testcase->dtable->fieldList['title']['title'] = $lang->testcase->title; $config->my->testcase->dtable->fieldList['title']['type'] = 'title'; -$config->my->testcase->dtable->fieldList['title']['link'] = helper::createLink('testcase', 'view', 'caseID={id}&version={version}'); +$config->my->testcase->dtable->fieldList['title']['link'] = array('module' => 'testcase', 'method' => 'view', 'params' => 'caseID={id}&version={version}'); $config->my->testcase->dtable->fieldList['title']['fixed'] = 'left'; $config->my->testcase->dtable->fieldList['pri'] = $config->testcase->dtable->fieldList['pri']; @@ -539,7 +539,7 @@ $config->my->audit->dtable->fieldList['id']['type'] = 'id'; $config->my->audit->dtable->fieldList['title']['name'] = 'title'; $config->my->audit->dtable->fieldList['title']['title'] = $lang->my->auditField->title; $config->my->audit->dtable->fieldList['title']['type'] = 'title'; -$config->my->audit->dtable->fieldList['title']['link'] = helper::createLink('story', 'view', 'id={id}'); +$config->my->audit->dtable->fieldList['title']['link'] = array('module' => 'story', 'method' => 'view', 'params' => 'id={id}'); $config->my->audit->dtable->fieldList['title']['fixed'] = 'left'; $config->my->audit->dtable->fieldList['title']['data-toggle'] = 'modal'; @@ -571,7 +571,7 @@ $config->my->project->dtable = new stdclass(); $config->my->project->dtable->fieldList['name']['name'] = 'name'; $config->my->project->dtable->fieldList['name']['title'] = $lang->project->name; $config->my->project->dtable->fieldList['name']['type'] = 'title'; -$config->my->project->dtable->fieldList['name']['link'] = helper::createLink('project', 'index', 'id={id}'); +$config->my->project->dtable->fieldList['name']['link'] = array('module' => 'project', 'method' => 'index', 'params' => 'id={id}'); $config->my->project->dtable->fieldList['name']['fixed'] = 'left'; $config->my->project->dtable->fieldList['name']['group'] = '1'; $config->my->project->dtable->fieldList['name']['iconRender'] = 'RAWJSRAWJS'; @@ -692,7 +692,7 @@ $config->my->execution->dtable->fieldList['code']['hidden'] = true; $config->my->execution->dtable->fieldList['project']['name'] = 'project'; $config->my->execution->dtable->fieldList['project']['title'] = $lang->execution->project; $config->my->execution->dtable->fieldList['project']['type'] = 'text'; -$config->my->execution->dtable->fieldList['project']['link'] = helper::createLink('project', 'view', 'id={project}'); +$config->my->execution->dtable->fieldList['project']['link'] = array('module' => 'project', 'method' => 'view', 'params' => 'id={project}'); $config->my->execution->dtable->fieldList['project']['group'] = '2'; $config->my->execution->dtable->fieldList['project']['hidden'] = true; @@ -808,7 +808,7 @@ $config->my->bug->dtable->fieldList['title']['title'] = $lang->bug->title; $config->my->bug->dtable->fieldList['title']['type'] = 'title'; $config->my->bug->dtable->fieldList['title']['minWidth'] = '200'; $config->my->bug->dtable->fieldList['title']['fixed'] = 'left'; -$config->my->bug->dtable->fieldList['title']['link'] = helper::createLink('bug', 'view', "bugID={id}"); +$config->my->bug->dtable->fieldList['title']['link'] = array('module' => 'bug', 'method' => 'view', 'params' => 'bugID={id}'); $config->my->bug->dtable->fieldList['title']['group'] = 'left'; $config->my->bug->dtable->fieldList['severity']['name'] = 'severity'; @@ -882,7 +882,7 @@ $config->my->bug->dtable->fieldList['confirmed']['group'] = '5'; $config->my->bug->dtable->fieldList['assignedTo']['name'] = 'assignedTo'; $config->my->bug->dtable->fieldList['assignedTo']['title'] = $lang->bug->assignedTo; $config->my->bug->dtable->fieldList['assignedTo']['type'] = 'assign'; -$config->my->bug->dtable->fieldList['assignedTo']['assignLink'] = helper::createLink('bug', 'assignTo', 'bugID={id}'); +$config->my->bug->dtable->fieldList['assignedTo']['assignLink'] = array('module' => 'bug', 'method' => 'assignTo', 'params' => 'bugID={id}'); $config->my->bug->dtable->fieldList['assignedTo']['group'] = '5'; $config->my->bug->dtable->fieldList['assignedDate']['name'] = 'assignedDate'; @@ -912,7 +912,7 @@ $config->my->bug->dtable->fieldList['resolution']['group'] = '6'; $config->my->bug->dtable->fieldList['toTask']['name'] = 'toTaskName'; $config->my->bug->dtable->fieldList['toTask']['title'] = $lang->bug->toTask; $config->my->bug->dtable->fieldList['toTask']['type'] = 'text'; -$config->my->bug->dtable->fieldList['toTask']['link'] = helper::createLink('task', 'view', 'taskID={toTask}'); +$config->my->bug->dtable->fieldList['toTask']['link'] = array('module' => 'task', 'method' => 'view', 'params' => 'taskID={toTask}'); $config->my->bug->dtable->fieldList['toTask']['group'] = '6'; $config->my->bug->dtable->fieldList['toTask']['hidden'] = true; @@ -957,14 +957,14 @@ $config->my->bug->dtable->fieldList['activatedDate']['hidden'] = true; $config->my->bug->dtable->fieldList['story']['name'] = 'storyName'; $config->my->bug->dtable->fieldList['story']['title'] = $lang->bug->story; $config->my->bug->dtable->fieldList['story']['type'] = 'text'; -$config->my->bug->dtable->fieldList['story']['link'] = helper::createLink('story', 'view', 'storyID={story}'); +$config->my->bug->dtable->fieldList['story']['link'] = array('module' => 'story', 'method' => 'view', 'params' => 'storyID={story}'); $config->my->bug->dtable->fieldList['story']['group'] = '8'; $config->my->bug->dtable->fieldList['story']['hidden'] = true; $config->my->bug->dtable->fieldList['task']['name'] = 'taskName'; $config->my->bug->dtable->fieldList['task']['title'] = $lang->bug->task; $config->my->bug->dtable->fieldList['task']['type'] = 'text'; -$config->my->bug->dtable->fieldList['task']['link'] = helper::createLink('task', 'view', 'taskID={task}'); +$config->my->bug->dtable->fieldList['task']['link'] = array('module' => 'task', 'method' => 'view', 'params' => 'taskID={task}'); $config->my->bug->dtable->fieldList['task']['group'] = '8'; $config->my->bug->dtable->fieldList['task']['hidden'] = true; @@ -1028,13 +1028,13 @@ $config->my->doc->actionList = array(); $config->my->doc->actionList['edit']['icon'] = 'edit'; $config->my->doc->actionList['edit']['text'] = $lang->edit; $config->my->doc->actionList['edit']['hint'] = $lang->edit; -$config->my->doc->actionList['edit']['url'] = helper::createLink('doc', 'edit', "docID={id}&comment=false&from={$lang->navGroup->doc}"); +$config->my->doc->actionList['edit']['url'] = array('module' => 'doc', 'method' => 'edit', 'params' => "docID={id}&comment=false&from={$lang->navGroup->doc}"); $config->my->doc->actionList['edit']['data-toggle'] = 'modal'; $config->my->doc->actionList['delete']['icon'] = 'trash'; $config->my->doc->actionList['delete']['text'] = $lang->delete; $config->my->doc->actionList['delete']['hint'] = $lang->delete; -$config->my->doc->actionList['delete']['url'] = helper::createLink('doc', 'delete', "docID={id}&confirm=no&from={$lang->navGroup->doc}"); +$config->my->doc->actionList['delete']['url'] = array('module' => 'doc', 'method' => 'delete', 'params' => "docID={id}&confirm=no&from={$lang->navGroup->doc}"); $config->my->doc->dtable = new stdclass(); $config->my->doc->dtable->fieldList['id']['name'] = 'id'; diff --git a/module/testtask/config/table.php b/module/testtask/config/table.php index 9148cefd4d..c45d3a7279 100644 --- a/module/testtask/config/table.php +++ b/module/testtask/config/table.php @@ -7,33 +7,33 @@ $config->testtask->actionList = array(); $config->testtask->actionList['start']['icon'] = 'play'; $config->testtask->actionList['start']['text'] = $lang->testtask->start; $config->testtask->actionList['start']['hint'] = $lang->testtask->start; -$config->testtask->actionList['start']['url'] = helper::createLink('testtask', 'start', 'taskID={id}'); +$config->testtask->actionList['start']['url'] = array('module' => 'testtask', 'method' => 'start', 'params' => 'taskID={id}'); $config->testtask->actionList['close']['icon'] = 'off'; $config->testtask->actionList['close']['text'] = $lang->testtask->close; $config->testtask->actionList['close']['hint'] = $lang->testtask->close; -$config->testtask->actionList['close']['url'] = helper::createLink('testtask', 'close', 'taskID={id}'); +$config->testtask->actionList['close']['url'] = array('module' => 'testtask', 'method' => 'close', 'params' => 'taskID={id}'); $config->testtask->actionList['block']['icon'] = 'pause'; $config->testtask->actionList['block']['text'] = $lang->testtask->block; $config->testtask->actionList['block']['hint'] = $lang->testtask->block; -$config->testtask->actionList['block']['url'] = helper::createLink('testtask', 'block', 'taskID={id}'); +$config->testtask->actionList['block']['url'] = array('module' => 'testtask', 'method' => 'block', 'params' => 'taskID={id}'); $config->testtask->actionList['activate']['icon'] = 'magic'; $config->testtask->actionList['activate']['text'] = $lang->testtask->activate; $config->testtask->actionList['activate']['hint'] = $lang->testtask->activate; -$config->testtask->actionList['activate']['url'] = helper::createLink('testtask', 'activate', 'taskID={id}'); +$config->testtask->actionList['activate']['url'] = array('module' => 'testtask', 'method' => 'activate', 'params' => 'taskID={id}'); $config->testtask->actionList['activate']['data-toggle'] = 'modal'; $config->testtask->actionList['cases']['icon'] = 'sitemap'; $config->testtask->actionList['cases']['text'] = $lang->testtask->cases; $config->testtask->actionList['cases']['hint'] = $lang->testtask->cases; -$config->testtask->actionList['cases']['url'] = helper::createLink('testtask', 'cases', 'taskID={id}'); +$config->testtask->actionList['cases']['url'] = array('module' => 'testtask', 'method' => 'cases', 'params' => 'taskID={id}'); $config->testtask->actionList['linkCase']['icon'] = 'link'; $config->testtask->actionList['linkCase']['text'] = $lang->testtask->linkCase; $config->testtask->actionList['linkCase']['hint'] = $lang->testtask->linkCase; -$config->testtask->actionList['linkCase']['url'] = helper::createLink('testtask', 'linkCase', 'taskID={id}&type=all¶m=myQueryID'); +$config->testtask->actionList['linkCase']['url'] = array('module' => 'testtask', 'method' => 'linkCase', 'params' => 'taskID={id}&type=all¶m=myQueryID'); $config->testtask->actionList['report']['icon'] = 'summary'; $config->testtask->actionList['report']['text'] = $lang->testtask->testreport; @@ -43,18 +43,18 @@ $config->testtask->actionList['report']['url'] = array('module' => 'testreport' $config->testtask->actionList['view']['icon'] = 'list-alt'; $config->testtask->actionList['view']['text'] = $lang->testtask->view; $config->testtask->actionList['view']['hint'] = $lang->testtask->view; -$config->testtask->actionList['view']['url'] = helper::createLink('testtask', 'view', 'taskID={id}'); +$config->testtask->actionList['view']['url'] = array('module' => 'testtask', 'method' => 'view', 'params' => 'taskID={id}'); $config->testtask->actionList['view']['data-toggle'] = 'modal'; $config->testtask->actionList['edit']['icon'] = 'edit'; $config->testtask->actionList['edit']['text'] = $lang->testtask->edit; $config->testtask->actionList['edit']['hint'] = $lang->testtask->edit; -$config->testtask->actionList['edit']['url'] = helper::createLink('testtask', 'edit', 'taskID={id}'); +$config->testtask->actionList['edit']['url'] = array('module' => 'testtask', 'method' => 'edit', 'params' => 'taskID={id}'); $config->testtask->actionList['delete']['icon'] = 'trash'; $config->testtask->actionList['delete']['text'] = $lang->testtask->delete; $config->testtask->actionList['delete']['hint'] = $lang->testtask->delete; -$config->testtask->actionList['delete']['url'] = helper::createLink('testtask', 'delete', 'taskID={id}'); +$config->testtask->actionList['delete']['url'] = array('module' => 'testtask', 'method' => 'delete', 'params' => 'taskID={id}'); $config->testtask->dtable = new stdclass(); $config->testtask->dtable->fieldList['id']['name'] = 'id'; @@ -64,13 +64,13 @@ $config->testtask->dtable->fieldList['id']['type'] = 'id'; $config->testtask->dtable->fieldList['title']['name'] = 'name'; $config->testtask->dtable->fieldList['title']['title'] = $lang->testtask->name; $config->testtask->dtable->fieldList['title']['type'] = 'title'; -$config->testtask->dtable->fieldList['title']['link'] = helper::createLink('testtask', 'view', "taskID={id}"); +$config->testtask->dtable->fieldList['title']['link'] = array('module' => 'testtask', 'method' => 'view', 'params' => 'taskID={id}'); $config->testtask->dtable->fieldList['title']['fixed'] = 'left'; $config->testtask->dtable->fieldList['build']['name'] = 'buildName'; $config->testtask->dtable->fieldList['build']['title'] = $lang->testtask->build; $config->testtask->dtable->fieldList['build']['type'] = 'text'; -$config->testtask->dtable->fieldList['build']['link'] = helper::createLink('build', 'view', "buildID={build}"); +$config->testtask->dtable->fieldList['build']['link'] = array('module' => 'build', 'method' => 'view', 'params' => 'buildID={build}'); $config->testtask->dtable->fieldList['build']['group'] = 'text'; $config->testtask->dtable->fieldList['product']['name'] = 'productName'; @@ -120,7 +120,7 @@ $config->testtask->testcase->dtable->fieldList['id']['fixed'] = 'left'; $config->testtask->testcase->dtable->fieldList['title']['name'] = 'title'; $config->testtask->testcase->dtable->fieldList['title']['title'] = $lang->testcase->title; $config->testtask->testcase->dtable->fieldList['title']['type'] = 'title'; -$config->testtask->testcase->dtable->fieldList['title']['link'] = helper::createLink('testcase', 'view', 'caseID={id}&version={version}&from=testtask&taskID={task}'); +$config->testtask->testcase->dtable->fieldList['title']['link'] = array('module' => 'testcase', 'method' => 'view', 'params' => 'caseID={id}&version={version}&from=testtask&taskID={task}'); $config->testtask->testcase->dtable->fieldList['title']['fixed'] = 'left'; foreach($config->testcase->dtable->fieldList as $key => $fieldList)