From beadb99a54eba446cb26044c08ff49fa0e9ce072 Mon Sep 17 00:00:00 2001 From: zhujinyong Date: Thu, 18 Mar 2021 13:45:37 +0800 Subject: [PATCH] * Fix link of my module. --- module/build/control.php | 4 ++-- module/common/lang/zh-cn.php | 2 +- module/my/view/bug.html.php | 4 ++-- module/my/view/testcase.html.php | 6 +++--- module/my/view/testtask.html.php | 16 ++++++++-------- module/product/control.php | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/module/build/control.php b/module/build/control.php index 629bfdc7c3..37e541f99e 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -32,7 +32,7 @@ class build extends control $this->executeHooks($buildID); - if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.loadProjectBuilds($executionID)")); // Code for task #5126. + if(isonlybody()) $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.loadExecutionBuilds($executionID)")); // Code for task #5126. $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('build', 'view', "buildID=$buildID"))); } @@ -350,7 +350,7 @@ class build extends control { $html = html::a($this->createLink('build', 'create', "executionID=$executionID&productID=$productID", '', $onlybody = true), $this->lang->build->create, '', "data-toggle='modal' data-type='iframe'"); $html .= '  '; - $html .= html::a("javascript:loadProjectBuilds($executionID)", $this->lang->refresh); + $html .= html::a("javascript:loadExecutionBuilds($executionID)", $this->lang->refresh); die($html); } die(html::select('build', $builds, $build, "class='form-control'")); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index e1e52cdb41..51fdef7fba 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -948,6 +948,6 @@ $lang->projectstory->menu = new stdclass(); $lang->stakeholder->menu = $lang->scrum->setMenu; $lang->nc->menu = $lang->auditplan->menu; -$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'qa', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage', 'entry'); +$lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage', 'entry'); include (dirname(__FILE__) . '/menuOrder.php'); diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php index 02c932bc4a..f8fff37170 100644 --- a/module/my/view/bug.html.php +++ b/module/my/view/bug.html.php @@ -103,8 +103,8 @@ pri?>' title='bug->priList, $bug->pri);?>'>bug->priList, $bug->pri)?> - createLink('bug', 'view', "bugID=$bug->id", '', '', $bug->project), $bug->title, null, "style='color: $bug->color' title={$bug->title} data-group='project'");?> - createLink('product', 'view', "productID=$bug->product", '', '', $bug->project), $bug->productName, null, "title={$bug->productName} data-group='product'");?> + createLink('bug', 'view', "bugID=$bug->id"), $bug->title, null, "style='color: $bug->color' title={$bug->title}");?> + createLink('product', explode('-', $config->productLink)[1], "productID=$bug->product"), $bug->productName, null, "title={$bug->productName}");?> bug->typeList, $bug->type, '');?> openedBy);?> diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php index d377925219..a906282949 100644 --- a/module/my/view/testcase.html.php +++ b/module/my/view/testcase.html.php @@ -85,7 +85,7 @@ pri?>' title='testcase->priList, $case->pri, $case->pri);?>'>testcase->priList, $case->pri, $case->pri)?> version";?> task";?> - createLink('testcase', 'view', $params, '', '', $case->project), $case->title, null, "style='color: $case->color' data-group='project'");?> + createLink('testcase', 'view', $params), $case->title, null, "style='color: $case->color'");?> taskName;?> @@ -99,8 +99,8 @@ product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID", $case, 'list', 'bug', '', '', '', '', '', $case->project); - common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase¶m=$caseID", $case, 'list', 'copy', '', '', '', '', '', $case->project); + common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID", $case, 'list', 'bug'); + common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase¶m=$caseID", $case, 'list', 'copy'); common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$caseID&version=$case->version", '', 'list', 'play', '', 'iframe', true, "data-width='95%'", '', $case->project); common::printIcon('testtask', 'results', "runID=$runID&caseID=$caseID", '', 'list', 'list-alt', '', 'iframe', true, "data-width='95%'", '', $case->project); common::printIcon('testcase', 'edit', "caseID=$caseID", $case, 'list', 'edit', '', '', '', '', '', $case->project); diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php index 0c2a4cf2f9..5f2053f694 100644 --- a/module/my/view/testtask.html.php +++ b/module/my/view/testtask.html.php @@ -47,22 +47,22 @@ id);?> - createLink('testtask', 'view', "taskID=$task->id", '', '', $task->project), $task->name, '', "data-group='project'");?> + createLink('testtask', 'view', "taskID=$task->id"), $task->name);?> executionName?> - build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build", '', '', $task->project), $task->buildName, '', "data-group='project'"));?> + build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?> begin?> end?> processStatus('testtask', $task);?> id", $task, 'list', 'sitemap', '', '', '', '', '', $task->project); - common::printIcon('testtask', 'view', "taskID=$task->id", '', 'list', 'list-alt','','iframe',true, 'data-width=800px', '', $task->project); - common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'list', 'link', '', '', '', '', '', $task->project); - common::printIcon('testreport', 'browse', "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list','flag', '', '', '', '', '', $task->project); - common::printIcon('testtask', 'edit', "taskID=$task->id", $task, 'list','','','',true, '', '', $task->project); + common::printIcon('testtask', 'cases', "taskID=$task->id", $task, 'list', 'sitemap'); + common::printIcon('testtask', 'view', "taskID=$task->id", '', 'list', 'list-alt','','iframe',true, 'data-width=800px'); + common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'list', 'link'); + common::printIcon('testreport', 'browse', "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list', 'flag'); + common::printIcon('testtask', 'edit', "taskID=$task->id", $task, 'list', '', '', '', true); if(common::hasPriv('testtask', 'delete', $task)) { - $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes", '', '', $task->project); + $deleteURL = $this->createLink('testtask', 'delete', "taskID=$task->id&confirm=yes"); echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"taskList\", confirmDelete)", '', '', "title='{$lang->testtask->delete}' class='btn'"); } ?> diff --git a/module/product/control.php b/module/product/control.php index 1a233c2bb8..123baba0fc 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -853,7 +853,7 @@ class product extends control { $executionsName = "executions[$number]"; $executions = empty($executions) ? array('' => '') : $executions; - die(html::select($executionsName, $executions, '', "class='form-control' onchange='loadProjectBuilds($productID, this.value, $number)'")); + die(html::select($executionsName, $executions, '', "class='form-control' onchange='loadExecutionBuilds($executionID, this.value, $number)'")); } }