diff --git a/config/routes.php b/config/routes.php index 97dd57daa8..f67bf12993 100644 --- a/config/routes.php +++ b/config/routes.php @@ -160,6 +160,8 @@ $routes['/modules'] = 'modules'; $routes['/reports'] = 'reports'; +$routes['/host/heartbeat'] = 'hostHeartbeat'; + $routes['/z/folders'] = 'zfolders'; $routes['/z/folders/:id'] = 'zfolder'; $routes['/z/files/:id'] = 'zfile'; diff --git a/db/update17.6.1.sql b/db/update17.6.1.sql index 4d18a3f6c4..a35527452a 100644 --- a/db/update17.6.1.sql +++ b/db/update17.6.1.sql @@ -1,2 +1,3 @@ ALTER TABLE `zt_host` ADD `type` varchar(30) NOT NULL DEFAULT 'normal' AFTER `admin`; +ALTER TABLE `zt_host` ADD `secret` varchar(50) NOT NULL DEFAULT '' AFTER `type`; ALTER TABLE `zt_vmtemplate` ADD `type` varchar(30) NOT NULL DEFAULT 'normal' AFTER `hostID`; diff --git a/module/common/lang/common.php b/module/common/lang/common.php index a9b7bd71ee..25591cce42 100644 --- a/module/common/lang/common.php +++ b/module/common/lang/common.php @@ -70,6 +70,7 @@ $lang->search = new stdclass(); $lang->devops = new stdclass(); $lang->team = new stdclass(); $lang->automation = new stdclass(); +$lang->zahost = new stdclass(); $lang->personnel = new stdclass(); $lang->mail = new stdclass(); $lang->testsuite = new stdclass(); diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 3de060ef37..0ad6d21ab9 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -179,6 +179,7 @@ $lang->score->common = 'Score'; $lang->build->common = 'Build'; $lang->testreport->common = 'Report'; $lang->automation->common = 'Automation'; +$lang->zahost->common = 'ZAhost'; $lang->team->common = 'Team'; $lang->user->common = 'User'; $lang->custom->common = 'Custom'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index c4bba1c349..c7e30e537e 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -179,6 +179,7 @@ $lang->score->common = 'Score'; $lang->build->common = 'Build'; $lang->testreport->common = 'Report'; $lang->automation->common = 'Automation'; +$lang->zahost->common = 'ZAhost'; $lang->team->common = 'Team'; $lang->user->common = 'User'; $lang->custom->common = 'Custom'; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index aec37d0a92..07309cd9a6 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -179,6 +179,7 @@ $lang->score->common = 'Score'; $lang->build->common = 'Build'; $lang->testreport->common = 'Report'; $lang->automation->common = 'Automation'; +$lang->zahost->common = 'ZAhost'; $lang->team->common = 'Team'; $lang->user->common = 'User'; $lang->custom->common = 'Custom'; diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 856fe405a8..20b8040334 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -383,7 +383,7 @@ $lang->qa->menu->testsuite = array('link' => "{$lang->testcase->testsuite}|test $lang->qa->menu->testtask = array('link' => "{$lang->testtask->common}|testtask|browse|productID=%s", 'subModule' => 'testtask', 'alias' => 'view,edit,linkcase,cases,start,close,batchrun,groupcase,report,importunitresult'); $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}|automation|browse|productID=%s", 'subModule' => 'automation', 'alias' => ''); +$lang->qa->menu->automation = array('link' => "{$lang->automation->common}|zahost|browse", 'subModule' => 'automation', 'alias' => ''); /* QA menu order. */ $lang->qa->menuOrder[5] = 'product'; @@ -396,8 +396,8 @@ $lang->qa->menuOrder[35] = 'report'; $lang->qa->menuOrder[40] = 'caselib'; $lang->qa->menuOrder[45] = 'automation'; -// $lang->qa->menu->automation['subMenu'] = new stdclass(); -// $lang->qa->menu->automation['subMenu']->browse = array('link' => "{$lang->intro}|automation|browse|productID=%s", 'alias' => ''); +$lang->qa->menu->automation['subMenu'] = new stdclass(); +$lang->qa->menu->automation['subMenu']->browse = array('link' => "{$lang->zahost->common}|zahost|browse", 'alias' => 'create'); // $lang->qa->menu->automation['subMenu']->framework = array('link' => '框架|automation|framework|productID=%s', 'alias' => ''); // $lang->qa->menu->automation['subMenu']->data = array('link' => '数据|automation|date|productID=%s', 'alias' => ''); // $lang->qa->menu->automation['subMenu']->interface = array('link' => '接口|automation|interface|productID=%s', 'alias' => ''); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 8080576b61..26a9d421e5 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -179,6 +179,7 @@ $lang->score->common = '我的积分'; $lang->build->common = '版本'; $lang->testreport->common = '测试报告'; $lang->automation->common = '自动化'; +$lang->zahost->common = '宿主机'; $lang->team->common = '团队'; $lang->user->common = '用户'; $lang->custom->common = '自定义'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index efb472f9ac..4e3d190202 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -163,6 +163,7 @@ $lang->score->common = '我的積分'; $lang->build->common = '版本'; $lang->testreport->common = '測試報告'; $lang->automation->common = '自動化'; +$lang->zahost->common = '宿主機'; $lang->team->common = '團隊'; $lang->user->common = '用戶'; $lang->custom->common = '自定義';