diff --git a/module/common/lang/common.php b/module/common/lang/common.php index c13b4367bf..3f7f8eb8a2 100644 --- a/module/common/lang/common.php +++ b/module/common/lang/common.php @@ -91,6 +91,7 @@ $lang->app = new stdclass(); $lang->host = new stdclass(); $lang->zahost = new stdclass(); $lang->zanode = new stdclass(); +$lang->autotest = new stdclass(); $lang->holiday = new stdclass(); $lang->contact = new stdclass(); $lang->dimension = new stdclass(); diff --git a/module/common/lang/de.php b/module/common/lang/de.php index c444bfc3e2..6b8ee2a176 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -237,6 +237,7 @@ $lang->score->common = 'Score'; $lang->build->common = 'Build'; $lang->testreport->common = 'Report'; $lang->automation->common = 'Automation'; +$lang->autotest->common = 'Automation'; $lang->team->common = 'Team'; $lang->user->common = 'User'; $lang->custom->common = 'Custom'; @@ -270,6 +271,7 @@ $lang->app->serverLink = 'Server Link'; $lang->review->common = 'Review'; $lang->zahost->common = 'ZAhost'; $lang->zanode->common = 'ZAnode'; +$lang->zanode->instructions = 'Instruction'; $lang->dimension->common = 'Dimension'; $lang->contact->common = 'Contacts'; $lang->space->common = 'Service'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index f62fe77d65..102ecd8075 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -237,6 +237,7 @@ $lang->score->common = 'Score'; $lang->build->common = 'Build'; $lang->testreport->common = 'Report'; $lang->automation->common = 'Automation'; +$lang->autotest->common = 'Automation'; $lang->team->common = 'Team'; $lang->user->common = 'User'; $lang->custom->common = 'Custom'; @@ -270,6 +271,7 @@ $lang->app->serverLink = 'Server Link'; $lang->review->common = 'Review'; $lang->zahost->common = 'ZAhost'; $lang->zanode->common = 'ZAnode'; +$lang->zanode->instruction = 'Instruction'; $lang->dimension->common = 'Dimension'; $lang->contact->common = 'Contacts'; $lang->space->common = 'Service'; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index f85c58e269..cd4ed364cf 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -237,6 +237,7 @@ $lang->score->common = 'Score'; $lang->build->common = 'Build'; $lang->testreport->common = 'Report'; $lang->automation->common = 'Automation'; +$lang->autotest->common = 'Automation'; $lang->team->common = 'Team'; $lang->user->common = 'User'; $lang->custom->common = 'Custom'; @@ -270,6 +271,7 @@ $lang->app->serverLink = 'Server Link'; $lang->review->common = 'Review'; $lang->zahost->common = 'ZAhost'; $lang->zanode->common = 'ZAnode'; +$lang->zanode->instructions = 'Instruction'; $lang->dimension->common = 'Dimension'; $lang->contact->common = 'Contacts'; $lang->space->common = 'Service'; diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 48708513eb..3bc87f7de9 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -492,9 +492,7 @@ $lang->qa->menu->testsuite = array('link' => "{$lang->testcase->testsuite}|t $lang->qa->menu->testtask = array('link' => "{$lang->testtask->common}|testtask|browse|productID=%s", 'subModule' => 'testtask,build', 'alias' => 'view,edit,linkcase,cases,start,close,batchrun,groupcase,report,importunitresult', 'exclude' => 'testtask-browseunits'); $lang->qa->menu->report = array('link' => "{$lang->testreport->common}|testreport|browse|productID=%s", 'subModule' => 'testreport'); $lang->qa->menu->caselib = array('link' => "{$lang->testcase->caselib}|caselib|browse|libID=0", 'subModule' => 'caselib'); -$lang->qa->menu->automation = array('link' => "{$lang->automation->common}:", 'subModule' => 'automation', 'alias' => '', 'class' => "qa-automation-menu"); -$lang->qa->menu->zahost = array('link' => "{$lang->zahost->common}|zahost|browse", 'subModule' => 'zahost'); -$lang->qa->menu->zanode = array('link' => "{$lang->zanode->common}|zanode|browse", 'subModule' => 'zanode'); +$lang->qa->menu->automation = array('link' => "{$lang->automation->common}|zanode|browse", 'subModule' => 'instruction,zahost,zanode'); /* QA menu order. */ $lang->qa->menuOrder[5] = 'product'; @@ -509,6 +507,11 @@ $lang->qa->menuOrder[45] = 'automation'; $lang->qa->dividerMenu = ',bug,testtask,caselib,automation,'; +$lang->qa->menu->automation['subMenu'] = new stdclass(); +$lang->qa->menu->automation['subMenu']->instruction = array('link' => "{$lang->zanode->instruction}|zanode|instruction", 'subModule' => 'instruction'); +$lang->qa->menu->automation['subMenu']->zahost = array('link' => "{$lang->zahost->common}|zahost|browse", 'subModule' => 'zahost'); +$lang->qa->menu->automation['subMenu']->zanode = array('link' => "{$lang->zanode->common}|zanode|browse", 'subModule' => 'zandoe'); + /* DevOps menu. */ $lang->devops->homeMenu = new stdclass(); $lang->devops->homeMenu->repos = array('link' => "{$lang->devops->repo}|repo|maintain", 'alias' => 'create,edit,import,createrepo'); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 1eee7eae6c..666498af02 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -237,6 +237,7 @@ $lang->score->common = '我的积分'; $lang->build->common = '版本'; $lang->testreport->common = '测试报告'; $lang->automation->common = '自动化'; +$lang->autotest->common = '自动化'; $lang->team->common = '团队'; $lang->user->common = '用户'; $lang->custom->common = '自定义'; @@ -270,6 +271,7 @@ $lang->app->serverLink = '服务器链接'; $lang->review->common = '审批'; $lang->zahost->common = '宿主机'; $lang->zanode->common = '执行节点'; +$lang->zanode->instruction = '说明'; $lang->dimension->common = '维度'; $lang->contact->common = '联系人'; $lang->space->common = '服务管理'; diff --git a/module/group/lang/de.php b/module/group/lang/de.php index 927c9be515..0bc0fe360c 100644 --- a/module/group/lang/de.php +++ b/module/group/lang/de.php @@ -365,6 +365,7 @@ $lang->group->package->browseTestreport = 'Browse Testreport'; $lang->group->package->manageTestreport = 'Manage Testreport'; $lang->group->package->deleteTestreport = 'Delete Testreport'; $lang->group->package->importTestreport = 'Import Testreport'; +$lang->group->package->autotestInstruction = 'Instruction'; $lang->group->package->browseZAHost = 'Browse Z A Host'; $lang->group->package->manageZAHost = 'Manage Z A Host'; $lang->group->package->deleteZAHost = 'Delete Z A Host'; diff --git a/module/group/lang/en.php b/module/group/lang/en.php index e2bd0f5985..1d359292ee 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -365,6 +365,7 @@ $lang->group->package->browseTestreport = 'Browse Testreport'; $lang->group->package->manageTestreport = 'Manage Testreport'; $lang->group->package->deleteTestreport = 'Delete Testreport'; $lang->group->package->importTestreport = 'Import Testreport'; +$lang->group->package->autotestInstruction = 'Instruction'; $lang->group->package->browseZAHost = 'Browse Z A Host'; $lang->group->package->manageZAHost = 'Manage Z A Host'; $lang->group->package->deleteZAHost = 'Delete Z A Host'; diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php index 24181d925c..3c1b3e7c36 100644 --- a/module/group/lang/fr.php +++ b/module/group/lang/fr.php @@ -365,6 +365,7 @@ $lang->group->package->browseTestreport = 'Browse Testreport'; $lang->group->package->manageTestreport = 'Manage Testreport'; $lang->group->package->deleteTestreport = 'Delete Testreport'; $lang->group->package->importTestreport = 'Import Testreport'; +$lang->group->package->autotestInstruction = 'Instruction'; $lang->group->package->browseZAHost = 'Browse Z A Host'; $lang->group->package->manageZAHost = 'Manage Z A Host'; $lang->group->package->deleteZAHost = 'Delete Z A Host'; diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index a6713ef4cc..c85509865f 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1358,6 +1358,7 @@ $lang->resource->zanode->createSnapshot = 'createSnapshot'; $lang->resource->zanode->editSnapshot = 'editSnapshot'; $lang->resource->zanode->restoreSnapshot = 'restoreSnapshot'; $lang->resource->zanode->deleteSnapshot = 'deleteSnapshot'; +$lang->resource->zanode->instruction = 'instruction'; $lang->zanode->methodOrder[0] = 'browse'; $lang->zanode->methodOrder[5] = 'create'; @@ -1376,6 +1377,7 @@ $lang->zanode->methodOrder[65] = 'createSnapshot'; $lang->zanode->methodOrder[70] = 'editSnapshot'; $lang->zanode->methodOrder[75] = 'restoreSnapshot'; $lang->zanode->methodOrder[80] = 'deleteSnapshot'; +$lang->zanode->methodOrder[85] = 'instruction'; $lang->resource->repo = new stdclass(); $lang->resource->repo->browse = 'browseAction'; diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index 27f0db70cc..bf452610e6 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -365,6 +365,7 @@ $lang->group->package->browseTestreport = '浏览测试报告'; $lang->group->package->manageTestreport = '创建维护测试报告'; $lang->group->package->deleteTestreport = '删除测试报告'; $lang->group->package->importTestreport = '导入导出测试报告'; +$lang->group->package->autotestInstruction = '说明'; $lang->group->package->browseZAHost = '浏览宿主机'; $lang->group->package->manageZAHost = '创建维护宿主机'; $lang->group->package->deleteZAHost = '删除宿主机'; diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php index 0f8bca5bd4..ece09a7517 100644 --- a/module/group/packagemanager.php +++ b/module/group/packagemanager.php @@ -221,13 +221,9 @@ $config->group->subset->testreport = new stdclass(); $config->group->subset->testreport->order = 710; $config->group->subset->testreport->nav = 'qa'; -$config->group->subset->zahost = new stdclass(); -$config->group->subset->zahost->order = 720; -$config->group->subset->zahost->nav = 'qa'; - -$config->group->subset->zanode = new stdclass(); -$config->group->subset->zanode->order = 730; -$config->group->subset->zanode->nav = 'qa'; +$config->group->subset->autotest = new stdclass(); +$config->group->subset->autotest->order = 715; +$config->group->subset->autotest->nav = 'qa'; $config->group->subset->caselib = new stdclass(); $config->group->subset->caselib->order = 740; @@ -2035,29 +2031,35 @@ $config->group->package->importTestreport->subset = 'testreport'; $config->group->package->importTestreport->privs = array(); $config->group->package->importTestreport->privs['testreport-export'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 30, 'depend' => array(), 'recommend' => array()); +$config->group->package->autotestInstruction = new stdclass(); +$config->group->package->autotestInstruction->order = 5; +$config->group->package->autotestInstruction->subset = 'autotest'; +$config->group->package->autotestInstruction->privs = array(); +$config->group->package->autotestInstruction->privs['zanode-instruction'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('qa-index'), 'recommend' => array('zanode-view')); + $config->group->package->browseZAHost = new stdclass(); $config->group->package->browseZAHost->order = 5; -$config->group->package->browseZAHost->subset = 'zahost'; +$config->group->package->browseZAHost->subset = 'autotest'; $config->group->package->browseZAHost->privs = array(); -$config->group->package->browseZAHost->privs['zahost-browse'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('qa-index'), 'recommend' => array('zahost-view')); +$config->group->package->browseZAHost->privs['zahost-browse'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('zanode-instruction'), 'recommend' => array('zahost-view')); $config->group->package->browseZAHost->privs['zahost-view'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 25, 'depend' => array('zahost-browse'), 'recommend' => array()); $config->group->package->manageZAHost = new stdclass(); $config->group->package->manageZAHost->order = 10; -$config->group->package->manageZAHost->subset = 'zahost'; +$config->group->package->manageZAHost->subset = 'autotest'; $config->group->package->manageZAHost->privs = array(); $config->group->package->manageZAHost->privs['zahost-create'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('zahost-browse'), 'recommend' => array('zahost-edit')); $config->group->package->manageZAHost->privs['zahost-edit'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 15, 'depend' => array('zahost-browse'), 'recommend' => array('zahost-create')); $config->group->package->deleteZAHost = new stdclass(); $config->group->package->deleteZAHost->order = 15; -$config->group->package->deleteZAHost->subset = 'zahost'; +$config->group->package->deleteZAHost->subset = 'autotest'; $config->group->package->deleteZAHost->privs = array(); $config->group->package->deleteZAHost->privs['zahost-delete'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 20, 'depend' => array('zahost-browse'), 'recommend' => array()); $config->group->package->image = new stdclass(); $config->group->package->image->order = 20; -$config->group->package->image->subset = 'zahost'; +$config->group->package->image->subset = 'autotest'; $config->group->package->image->privs = array(); $config->group->package->image->privs['zahost-browseImage'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 30, 'depend' => array('zahost-browse'), 'recommend' => array()); $config->group->package->image->privs['zahost-downloadImage'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 35, 'depend' => array('zahost-browseImage', 'zahost-cancelDownload'), 'recommend' => array()); @@ -2065,14 +2067,14 @@ $config->group->package->image->privs['zahost-cancelDownload'] = array('edition' $config->group->package->browseZANode = new stdclass(); $config->group->package->browseZANode->order = 5; -$config->group->package->browseZANode->subset = 'zanode'; +$config->group->package->browseZANode->subset = 'autotest'; $config->group->package->browseZANode->privs = array(); -$config->group->package->browseZANode->privs['zanode-browse'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('qa-index'), 'recommend' => array('zanode-view')); +$config->group->package->browseZANode->privs['zanode-browse'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('zanode-instruction'), 'recommend' => array('zanode-view')); $config->group->package->browseZANode->privs['zanode-view'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 50, 'depend' => array('zanode-browse'), 'recommend' => array()); $config->group->package->manageZANode = new stdclass(); $config->group->package->manageZANode->order = 10; -$config->group->package->manageZANode->subset = 'zanode'; +$config->group->package->manageZANode->subset = 'autotest'; $config->group->package->manageZANode->privs = array(); $config->group->package->manageZANode->privs['zanode-create'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('zanode-browse', 'zanode-view'), 'recommend' => array('zanode-close', 'zanode-edit', 'zanode-getVNC', 'zanode-reboot', 'zanode-resume', 'zanode-start', 'zanode-suspend')); $config->group->package->manageZANode->privs['zanode-edit'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 15, 'depend' => array('zanode-browse', 'zanode-view'), 'recommend' => array('zanode-close', 'zanode-create', 'zanode-getVNC', 'zanode-reboot', 'zanode-resume', 'zanode-start', 'zanode-suspend')); @@ -2085,13 +2087,13 @@ $config->group->package->manageZANode->privs['zanode-suspend'] = array('edition' $config->group->package->importZANode = new stdclass(); $config->group->package->importZANode->order = 15; -$config->group->package->importZANode->subset = 'zanode'; +$config->group->package->importZANode->subset = 'autotest'; $config->group->package->importZANode->privs = array(); $config->group->package->importZANode->privs['zanode-createImage'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 55, 'depend' => array('zanode-browse'), 'recommend' => array()); $config->group->package->snapshot = new stdclass(); $config->group->package->snapshot->order = 25; -$config->group->package->snapshot->subset = 'zanode'; +$config->group->package->snapshot->subset = 'autotest'; $config->group->package->snapshot->privs = array(); $config->group->package->snapshot->privs['zanode-browseSnapshot'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 60, 'depend' => array('zanode-view'), 'recommend' => array()); $config->group->package->snapshot->privs['zanode-createSnapshot'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 65, 'depend' => array('zanode-browse', 'zanode-view'), 'recommend' => array('zanode-editSnapshot'));