* modulePageActions is modified to TRActions.

This commit is contained in:
leiyong
2020-10-21 09:17:33 +08:00
parent 10a781e077
commit 6af8ff9971
14 changed files with 31 additions and 31 deletions
+2 -2
View File
@@ -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)
{
if($this->config->global->flow == 'full') $this->loadModel('qa')->setSubMenu('bug', $key, $productID);
+2 -2
View File
@@ -114,8 +114,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);
+1 -1
View File
@@ -29,7 +29,7 @@ include 'chosen.html.php';
<div class='container'>
<div id="pageNav" class='btn-toolbar'><?php if(isset($lang->modulePageNav)) echo $lang->modulePageNav;?></div>
<nav id='subNavbar'><?php common::printModuleMenu($this->moduleName);?></nav>
<div id="pageActions"><div class='btn-toolbar'><?php if(isset($lang->modulePageActions)) echo $lang->modulePageActions;?></div></div>
<div id="pageActions"><div class='btn-toolbar'><?php if(isset($lang->TRActions)) echo $lang->TRActions;?></div></div>
</div>
</div>
<?php
+5 -5
View File
@@ -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'), "<i class='icon icon-plus'></i> " . $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'), "<i class='icon icon-plus'></i> " . $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');
@@ -341,7 +341,7 @@ class doc extends control
$this->product->setMenu($this->product->getPairs(), $lib->product);
$this->lang->set('menugroup.doc', 'product');
$this->lang->modulePageActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), "<i class='icon icon-plus'></i> " . $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'), "<i class='icon icon-plus'></i> " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : '';
}
elseif($this->from == 'project')
{
@@ -350,7 +350,7 @@ class doc extends control
$this->project->setMenu($this->project->getPairs('nocode'), $lib->project);
$this->lang->set('menugroup.doc', 'project');
$this->lang->modulePageActions = common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib'), "<i class='icon icon-plus'></i> " . $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'), "<i class='icon icon-plus'></i> " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe' data-width='70%'") : '';
}
else
{
+1 -1
View File
@@ -110,7 +110,7 @@ class docModel extends model
$actions = $this->setFastMenu($fastLib);
$actions .= common::hasPriv('doc', 'createLib') ? html::a(helper::createLink('doc', 'createLib', "type={$type}&objectID={$currentLib}"), "<i class='icon icon-plus'></i> " . $this->lang->doc->createLib, '', "class='btn btn-secondary iframe'") : '';
$this->lang->modulePageActions = $actions;
$this->lang->TRActions = $actions;
}
//$selectHtml .= $crumb ? $crumb : $this->getCrumbs($libID, $moduleID);
+1 -1
View File
@@ -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'), "<i class='icon icon-plus'></i> " . $this->lang->jenkins->create, '', "class='btn btn-primary'");
if(common::hasPriv('jenkins', 'create')) $this->lang->TRActions = html::a(helper::createLink('jenkins', 'create'), "<i class='icon icon-plus'></i> " . $this->lang->jenkins->create, '', "class='btn btn-primary'");
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
+1 -1
View File
@@ -57,7 +57,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'), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->product->create, '', "class='btn btn-primary'");
if(common::hasPriv('product', 'create')) $this->lang->TRActions = html::a($this->createLink('product', 'create'), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->product->create, '', "class='btn btn-primary'");
$this->view->title = $this->lang->product->index;
$this->view->position[] = $this->lang->product->index;
+2 -2
View File
@@ -87,8 +87,8 @@ class productModel extends model
}
}
$this->lang->modulePageNav = $pageNav;
$this->lang->modulePageActions = $pageActions;
$this->lang->modulePageNav = $pageNav;
$this->lang->TRActions = $pageActions;
foreach($this->lang->product->menu as $key => $menu)
{
$replace = $productID;
+2 -2
View File
@@ -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'), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->project->create, '', "class='btn btn-primary'");
if(common::hasPriv('project', 'create')) $this->lang->TRActions = html::a($this->createLink('project', 'create'), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->project->create, '', "class='btn btn-primary'");
$this->view->title = $this->lang->project->index;
$this->view->position[] = $this->lang->project->index;
@@ -969,7 +969,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();
}
+1 -1
View File
@@ -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'), "<i class='icon icon-plus'></i> " . $this->lang->repo->create, '', "class='btn btn-primary'");
if(common::hasPriv('repo', 'create')) $this->lang->TRActions = html::a(helper::createLink('repo', 'create'), "<i class='icon icon-plus'></i> " . $this->lang->repo->create, '', "class='btn btn-primary'");
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
+2 -2
View File
@@ -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)
{
if($this->config->global->flow == 'full') $this->loadModel('qa')->setSubMenu('testcase', $key, $productID);
+2 -2
View File
@@ -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)
{
if($this->config->global->flow == 'full') $this->loadModel('qa')->setSubMenu('testreport', $key, $productID);
+2 -2
View File
@@ -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);
+7 -7
View File
@@ -40,9 +40,9 @@ class testtaskModel extends model
$selectHtml .= "</div>";
$selectHtml .= "</div>";
$this->lang->modulePageActions = '';
if(common::hasPriv('testtask', 'view')) $this->lang->modulePageActions .= html::a(helper::createLink('testtask', 'view', "taskID={$testtask->id}"), "<i class='icon icon-file-text'> </i>" . $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}"), "<i class='icon icon-flag'> </i>" . $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}"), "<i class='icon icon-file-text'> </i>" . $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}"), "<i class='icon icon-flag'> </i>" . $this->lang->testtask->reportField, '', "class='btn'");
}
$this->app->loadLang('qa');
@@ -75,8 +75,8 @@ class testtaskModel 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)
{
if($this->config->global->flow == 'full') $this->loadModel('qa')->setSubMenu('testtask', $key, $productID);
@@ -167,8 +167,8 @@ class testtaskModel extends model
}
$pageNav .= $selectHtml;
$this->lang->modulePageNav = $pageNav;
$this->lang->modulePageActions = $pageActions;
$this->lang->modulePageNav = $pageNav;
$this->lang->TRActions = $pageActions;
if($this->config->global->flow != 'full') $this->lang->testtask->menu = new stdclass();
foreach($this->lang->testtask->menu as $key => $value)
{