From c1e6e6a82ce8107f3310213ed6e43dc3a069babb Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Wed, 21 Oct 2020 09:11:19 +0800 Subject: [PATCH] modulePageActions is modified to TRActions. --- module/bug/model.php | 4 ++-- module/caselib/model.php | 4 ++-- module/common/view/header.html.php | 2 +- module/doc/control.php | 10 +++++----- module/doc/model.php | 2 +- module/jenkins/control.php | 2 +- module/product/control.php | 2 +- module/product/model.php | 2 +- module/programplan/control.php | 2 +- module/project/control.php | 6 +++--- module/repo/control.php | 2 +- module/testcase/model.php | 4 ++-- module/testreport/model.php | 4 ++-- module/testsuite/model.php | 4 ++-- module/testtask/model.php | 10 +++++----- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/module/bug/model.php b/module/bug/model.php index a094a1b67e..ca55c71434 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -87,8 +87,8 @@ class bugModel extends model } $pageNav .= $selectHtml; - $this->lang->modulePageNav = $pageNav; - $this->lang->modulePageActions = $pageActions; + $this->lang->modulePageNav = $pageNav; + $this->lang->TRActions = $pageActions; foreach($this->lang->bug->menu as $key => $menu) { $this->loadModel('qa')->setSubMenu('bug', $key, $productID); diff --git a/module/caselib/model.php b/module/caselib/model.php index 3b68b227fd..582ed0d496 100644 --- a/module/caselib/model.php +++ b/module/caselib/model.php @@ -96,8 +96,8 @@ class caselibModel extends model } $pageNav .= $selectHtml; - $this->lang->modulePageNav = $pageNav; - $this->lang->modulePageActions = $pageActions; + $this->lang->modulePageNav = $pageNav; + $this->lang->TRActions = $pageActions; foreach($this->lang->caselib->menu as $key => $value) { if($this->config->global->flow == 'full') $this->loadModel('qa')->setSubMenu('caselib', $key, $libID); diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php index fb260770fa..93ad39d426 100755 --- a/module/common/view/header.html.php +++ b/module/common/view/header.html.php @@ -48,7 +48,7 @@ include 'chosen.html.php';
-
modulePageActions)) echo $lang->modulePageActions;?>
+
TRActions)) echo $lang->TRActions;?>
diff --git a/module/doc/control.php b/module/doc/control.php index 5efce3d457..136f864622 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -46,9 +46,9 @@ class doc extends control $this->app->loadClass('pager', $static = true); $pager = new pager(0, 5, 1); - $this->lang->modulePageActions = $this->doc->setFastMenu($this->lang->doc->fast); - $this->lang->modulePageActions .= common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : ''; - $this->lang->modulePageActions .= common::hasPriv('doc', 'create') ? $this->doc->buildCreateButton4Doc() : ''; + $this->lang->TRActions = $this->doc->setFastMenu($this->lang->doc->fast); + $this->lang->TRActions .= common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : ''; + $this->lang->TRActions .= common::hasPriv('doc', 'create') ? $this->doc->buildCreateButton4Doc() : ''; $actionURL = $this->createLink('doc', 'browse', "lib=0&browseType=bySearch&queryID=myQueryID"); $this->doc->buildSearchForm(0, array(), 0, $actionURL, 'index'); @@ -344,7 +344,7 @@ class doc extends control $this->product->setMenu($this->product->getPairs('', $this->session->PRJ), $lib->product); $this->lang->set('menugroup.doc', 'product'); - $this->lang->modulePageActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : ''; + $this->lang->TRActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : ''; } elseif($this->from == 'project') { @@ -354,7 +354,7 @@ class doc extends control $this->project->setMenu($this->project->getPairs('nocode', $this->session->PRJ), $lib->project); $this->lang->set('menugroup.doc', 'project'); - $this->lang->modulePageActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : ''; + $this->lang->TRActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), " " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : ''; } else { diff --git a/module/doc/model.php b/module/doc/model.php index 19b6e3e47f..d7a966ab64 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -109,7 +109,7 @@ class docModel extends model $actions = $this->setFastMenu($fastLib); - $this->lang->modulePageActions = $actions; + $this->lang->TRActions = $actions; } //$selectHtml .= $crumb ? $crumb : $this->getCrumbs($libID, $moduleID); diff --git a/module/jenkins/control.php b/module/jenkins/control.php index 67658f061f..ea52501ccb 100644 --- a/module/jenkins/control.php +++ b/module/jenkins/control.php @@ -35,7 +35,7 @@ class jenkins extends control */ public function browse($orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { - if(common::hasPriv('jenkins', 'create')) $this->lang->modulePageActions = html::a(helper::createLink('jenkins', 'create'), " " . $this->lang->jenkins->create, '', "class='btn btn-primary'"); + if(common::hasPriv('jenkins', 'create')) $this->lang->TRActions = html::a(helper::createLink('jenkins', 'create'), " " . $this->lang->jenkins->create, '', "class='btn btn-primary'"); $this->app->loadClass('pager', $static = true); $pager = new pager($recTotal, $recPerPage, $pageID); diff --git a/module/product/control.php b/module/product/control.php index bb029f0e88..f0a85a7cb2 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -58,7 +58,7 @@ class product extends control $branch = (int)$this->cookie->preBranch; //$this->product->setMenu($this->products, $productID, $branch); - if(common::hasPriv('product', 'create')) $this->lang->modulePageActions = html::a($this->createLink('product', 'create'), " " . $this->lang->product->create, '', "class='btn btn-primary'"); + if(common::hasPriv('product', 'create')) $this->lang->TRActions = html::a($this->createLink('product', 'create'), " " . $this->lang->product->create, '', "class='btn btn-primary'"); $this->view->title = $this->lang->product->index; $this->view->position[] = $this->lang->product->index; diff --git a/module/product/model.php b/module/product/model.php index 0b98b2972d..6730982efb 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -45,7 +45,7 @@ class productModel extends model $pageActions .= html::a(helper::createLink('programplan', 'create', "program=$product->program&productID=$productID"), " {$this->lang->programplan->create}", '', "class='btn btn-primary'"); } - $this->lang->modulePageActions = $pageActions; + $this->lang->TRActions = $pageActions; foreach($this->lang->product->menu as $key => $menu) { diff --git a/module/programplan/control.php b/module/programplan/control.php index 8f2a9e54e9..c2dddd230c 100644 --- a/module/programplan/control.php +++ b/module/programplan/control.php @@ -60,7 +60,7 @@ class programplan extends control $this->commonAction($programID, $productID, $type); $this->session->set('programPlanList', $this->app->getURI(true)); - if(common::hasPriv('programplan', 'create')) $this->lang->modulePageActions = html::a($this->createLink('programplan', 'create', "programID=$programID"), " " . $this->lang->programplan->create, '', "class='btn btn-primary'"); + if(common::hasPriv('programplan', 'create')) $this->lang->TRActions = html::a($this->createLink('programplan', 'create', "programID=$programID"), " " . $this->lang->programplan->create, '', "class='btn btn-primary'"); $selectCustom = 0; $dateDetails = 1; diff --git a/module/project/control.php b/module/project/control.php index b9ad6e192c..30389b874b 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -45,7 +45,7 @@ class project extends control if($this->app->viewType != 'mhtml') unset($this->lang->project->menu->index); $this->commonAction($projectID); - if(common::hasPriv('project', 'create')) $this->lang->modulePageActions = html::a($this->createLink('project', 'create'), " " . $this->lang->project->create, '', "class='btn btn-primary'"); + if(common::hasPriv('project', 'create')) $this->lang->TRActions = html::a($this->createLink('project', 'create'), " " . $this->lang->project->create, '', "class='btn btn-primary'"); $this->view->title = $this->lang->project->index; $this->view->position[] = $this->lang->project->index; @@ -116,7 +116,7 @@ class project extends control $this->loadModel('task'); $this->loadModel('datatable'); - if(common::hasPriv('project', 'create')) $this->lang->modulePageActions = html::a($this->createLink('project', 'create', ''), " " . $this->lang->project->create, '', "class='btn btn-primary'"); + if(common::hasPriv('project', 'create')) $this->lang->TRActions = html::a($this->createLink('project', 'create', ''), " " . $this->lang->project->create, '', "class='btn btn-primary'"); $this->project->getLimitedProject(); @@ -982,7 +982,7 @@ class project extends control $this->view->chartData = $chartData; $this->view->dayList = array('full' => $this->lang->project->interval . '1' . $this->lang->day) + $dayList; - unset($this->lang->modulePageActions); + unset($this->lang->TRActions); $this->display(); } diff --git a/module/repo/control.php b/module/repo/control.php index c90640a037..6358b4f539 100644 --- a/module/repo/control.php +++ b/module/repo/control.php @@ -49,7 +49,7 @@ class repo extends control { $repoID = $this->session->repoID; $this->repo->setMenu($this->repos, $repoID, false); - if(common::hasPriv('repo', 'create')) $this->lang->modulePageActions = html::a(helper::createLink('repo', 'create'), " " . $this->lang->repo->create, '', "class='btn btn-primary'"); + if(common::hasPriv('repo', 'create')) $this->lang->TRActions = html::a(helper::createLink('repo', 'create'), " " . $this->lang->repo->create, '', "class='btn btn-primary'"); $this->app->loadClass('pager', $static = true); $pager = new pager($recTotal, $recPerPage, $pageID); diff --git a/module/testcase/model.php b/module/testcase/model.php index 515fba839d..596a010f34 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -108,8 +108,8 @@ class testcaseModel extends model } $pageNav .= $selectHtml; - $this->lang->modulePageNav = $pageNav; - $this->lang->modulePageActions = $pageActions; + $this->lang->modulePageNav = $pageNav; + $this->lang->TRActions = $pageActions; foreach($this->lang->testcase->menu as $key => $menu) { $this->loadModel('qa')->setSubMenu('testcase', $key, $productID); diff --git a/module/testreport/model.php b/module/testreport/model.php index 29fa6dfe95..855e71dd26 100644 --- a/module/testreport/model.php +++ b/module/testreport/model.php @@ -45,8 +45,8 @@ class testreportModel extends model } $pageNav .= $selectHtml; - $this->lang->modulePageNav = $pageNav; - $this->lang->modulePageActions = $pageActions; + $this->lang->modulePageNav = $pageNav; + $this->lang->TRActions = $pageActions; foreach($this->lang->testtask->menu as $key => $value) { $this->loadModel('qa')->setSubMenu('testreport', $key, $productID); diff --git a/module/testsuite/model.php b/module/testsuite/model.php index 12c6bdf3fc..61716d7de9 100644 --- a/module/testsuite/model.php +++ b/module/testsuite/model.php @@ -53,8 +53,8 @@ class testsuiteModel extends model } $pageNav .= $selectHtml; - $this->lang->modulePageNav = $pageNav; - $this->lang->modulePageActions = $pageActions; + $this->lang->modulePageNav = $pageNav; + $this->lang->TRActions = $pageActions; foreach($this->lang->testsuite->menu as $key => $value) { if($this->config->global->flow == 'full') $this->loadModel('qa')->setSubMenu('testsuite', $key, $productID); diff --git a/module/testtask/model.php b/module/testtask/model.php index 067ab1c8a5..0f2ed6bbca 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -40,9 +40,9 @@ class testtaskModel extends model $selectHtml .= ""; $selectHtml .= ""; - $this->lang->modulePageActions = ''; - if(common::hasPriv('testtask', 'view')) $this->lang->modulePageActions .= html::a(helper::createLink('testtask', 'view', "taskID={$testtask->id}"), " " . $this->lang->testtask->view, '', "class='btn'"); - if(common::hasPriv('testreport', 'browse')) $this->lang->modulePageActions .= html::a(helper::createLink('testreport', 'browse', "objectID=$productID&objectType=product&extra={$testtask->id}"), " " . $this->lang->testtask->reportField, '', "class='btn'"); + $this->lang->TRActions = ''; + if(common::hasPriv('testtask', 'view')) $this->lang->TRActions .= html::a(helper::createLink('testtask', 'view', "taskID={$testtask->id}"), " " . $this->lang->testtask->view, '', "class='btn'"); + if(common::hasPriv('testreport', 'browse')) $this->lang->TRActions .= html::a(helper::createLink('testreport', 'browse', "objectID=$productID&objectType=product&extra={$testtask->id}"), " " . $this->lang->testtask->reportField, '', "class='btn'"); } $this->app->loadLang('qa'); @@ -76,7 +76,7 @@ class testtaskModel extends model $pageNav .= $selectHtml; $this->lang->modulePageNav = $pageNav; - $this->lang->modulePageActions = $pageActions; + $this->lang->TRActions = $pageActions; foreach($this->lang->testtask->menu as $key => $value) { $this->loadModel('qa')->setSubMenu('testtask', $key, $productID); @@ -138,7 +138,7 @@ class testtaskModel extends model $pageNav .= $selectHtml; $this->lang->modulePageNav = $pageNav; - $this->lang->modulePageActions = $pageActions; + $this->lang->TRActions = $pageActions; if($this->config->global->flow != 'full') $this->lang->testtask->menu = new stdclass(); foreach($this->lang->testtask->menu as $key => $value) {