Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* code for task #2528.

Browse Source
This commit is contained in:
chenfeiCF
2016-04-12 08:28:42 +08:00
parent 12925bc1cd
commit b1e147fec3
8 changed files with 59 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/en.php
+11
View File
@@ -220,10 +220,20 @@ $lang->task->menu = $lang->project->menu;
$lang->build->menu = $lang->project->menu;
/* QA menu. */
$lang->qa = new stdclass();
$lang->qa->menu = new stdclass();
$lang->qa->menu->product = '%s';
$lang->qa->menu->index = '首页|qa|index|locate=no&productID=%s';
$lang->qa->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->qa->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s');
$lang->qa->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s');
$lang->bug = new stdclass();
$lang->bug->menu = new stdclass();
$lang->bug->menu->product = '%s';
$lang->bug->menu->index = 'Index|qa|index|locate=no&productID=%s';
$lang->bug->menu->bug = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,confirmbug,assignto', 'subModule' => 'tree');
$lang->bug->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s');
$lang->bug->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s');
@@ -232,6 +242,7 @@ $lang->testcase = new stdclass();
$lang->testcase->menu = new stdclass();
$lang->testcase->menu->product = '%s';
$lang->testcase->menu->index = 'Index|qa|index|locate=no&productID=%s';
$lang->testcase->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testcase->menu->testcase = array('link' => 'Case|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase', 'subModule' => 'tree');
$lang->testcase->menu->testtask = array('link' => 'Build|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase');
module/common/lang/menuOrder.php
+2
View File
@@ -69,12 +69,14 @@ $lang->build->menuOrder = $lang->project->menuOrder;
/* bug menu order. */
$lang->bug->menuOrder[0] = 'product';
$lang->bug->menuOrder[1] = 'index';
$lang->bug->menuOrder[5] = 'bug';
$lang->bug->menuOrder[10] = 'testcase';
$lang->bug->menuOrder[15] = 'testtask';
/* testcase menu order. */
$lang->testcase->menuOrder[0] = 'product';
$lang->testcase->menuOrder[1] = 'index';
$lang->testcase->menuOrder[5] = 'bug';
$lang->testcase->menuOrder[10] = 'testcase';
$lang->testcase->menuOrder[15] = 'testtask';
module/common/lang/zh-cn.php
+11
View File
@@ -222,10 +222,20 @@ $lang->task->menu = $lang->project->menu;
$lang->build->menu = $lang->project->menu;
/* QA视图菜单设置。*/
$lang->qa = new stdclass();
$lang->qa->menu = new stdclass();
$lang->qa->menu->product = '%s';
$lang->qa->menu->index = '首页|qa|index|locate=no&productID=%s';
$lang->qa->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->qa->menu->testcase = array('link' => '用例|testcase|browse|productID=%s');
$lang->qa->menu->testtask = array('link' => '版本|testtask|browse|productID=%s');
$lang->bug = new stdclass();
$lang->bug->menu = new stdclass();
$lang->bug->menu->product = '%s';
$lang->bug->menu->index = '首页|qa|index|locate=no&productID=%s';
$lang->bug->menu->bug = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,confirmbug,assignto', 'subModule' => 'tree');
$lang->bug->menu->testcase = array('link' => '用例|testcase|browse|productID=%s');
$lang->bug->menu->testtask = array('link' => '版本|testtask|browse|productID=%s');
@@ -234,6 +244,7 @@ $lang->testcase = new stdclass();
$lang->testcase->menu = new stdclass();
$lang->testcase->menu->product = '%s';
$lang->testcase->menu->index = '首页|qa|index|locate=no&productID=%s';
$lang->testcase->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testcase->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase', 'subModule' => 'tree');
$lang->testcase->menu->testtask = array('link' => '版本|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase');
module/qa/control.php
+11 -2
View File
@@ -17,8 +17,17 @@ class qa extends control
* @access public
* @return void
*/
public function index()
public function index($locate = 'yes', $productID = 0)
{
$this->locate($this->createLink('bug', 'browse'));
if($locate == 'yes') $this->locate($this->createLink('bug', 'browse'));
$this->loadModel('product');
$this->products = $this->product->getPairs('nocode');
$this->qa->setMenu($this->products, $productID);
$this->view->title = $this->lang->qa->index;
$this->view->position[] = $this->lang->qa->index;
$this->view->products = $this->products;
$this->display();
}
}
module/qa/lang/en.php
+2 -2
View File
@@ -10,5 +10,5 @@
* @link http://www.zentao.net
*/
$lang->qa = new stdclass();
$lang->qa->common = 'Test';
$lang->qa->index = "Index";
$lang->qa->common = 'Test';
$lang->qa->index = "Index";
module/qa/lang/zh-cn.php
+2 -3
View File
@@ -9,6 +9,5 @@
* @version $Id: zh-cn.php 4129 2013-01-18 01:58:14Z wwccss $
* @link http://www.zentao.net
*/
$lang->qa = new stdclass();
$lang->qa->common = '测试视图';
$lang->qa->index = "测试首页";
$lang->qa->common = '测试视图';
$lang->qa->index = '测试首页';
module/qa/model.php
+19
View File
@@ -11,5 +11,24 @@
*/
class qaModel extends model
{
/**
* Set menu.
*
* @param array $products
* @param int $productID
* @param int $branch
* @access public
* @return void
*/
public function setMenu($products, $productID, $branch = 0)
{
$this->loadModel('product')->setMenu($products, $productID, $branch);
$selectHtml = $this->product->select($products, $productID, 'qa', 'index', '', $branch);
foreach($this->lang->qa->menu as $key => $menu)
{
$replace = ($key == 'product') ? $selectHtml : $productID;
common::setMenuVars($this->lang->qa->menu, $key, $replace);
}
}
}
module/qa/view/index.html.php
+1 -2
View File
@@ -11,6 +11,5 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<div id='doc3'>
</div>
<?php echo $this->fetch('block', 'dashboard', 'module=qa');?>
<?php include '../../common/view/footer.html.php';?>