* Remve unused code.

db/update18.0.sql

@@ -64,7 +64,7 @@ h.`deleted` = a.`deleted`
 WHERE
 	h.`assetID` = a.`id`;
 
-ALTER TABLE `zt_host` DROP COLUMN `assetID`,
+ALTER TABLE `zt_host` DROP COLUMN `assetID`;
 
 DROP TABLE IF EXISTS `zt_asset`;
 DROP TABLE IF EXISTS `zt_baseimagebrowser`;

module/action/lang/de.php

@@ -640,8 +640,6 @@ $lang->action->dynamicAction->caselib['hidden']    = 'Hide Case Lib';
 
 $lang->action->dynamicAction->zahost['created'] = 'Create Host';
 
-$lang->action->dynamicAction->vmtemplate['created'] = 'Create Virtual Host Template';
-
 $lang->action->dynamicAction->zanode['created'] = 'Create Zagent Node';
 $lang->action->dynamicAction->zanode['suspend'] = 'Suspend Zagent Node';
 $lang->action->dynamicAction->zanode['resume']  = 'Resume Zagent Node';

module/action/lang/en.php

@@ -641,8 +641,6 @@ $lang->action->dynamicAction->caselib['hidden']    = 'Hide Case Lib';
 
 $lang->action->dynamicAction->zahost['created'] = 'Create Host';
 
-$lang->action->dynamicAction->vmtemplate['created'] = 'Create Virtual Host Template';
-
 $lang->action->dynamicAction->zanode['created'] = 'Create Zagent Node';
 $lang->action->dynamicAction->zanode['suspend'] = 'Suspend Zagent Node';
 $lang->action->dynamicAction->zanode['resume']  = 'Resume Zagent Node';

module/action/lang/fr.php

@@ -640,8 +640,6 @@ $lang->action->dynamicAction->caselib['hidden']    = 'Masqué CasTest Lib';
 
 $lang->action->dynamicAction->zahost['created'] = 'Create Host';
 
-$lang->action->dynamicAction->vmtemplate['created'] = 'Create Virtual Host Template';
-
 $lang->action->dynamicAction->zanode['created'] = 'Create Zagent Node';
 $lang->action->dynamicAction->zanode['suspend'] = 'Suspend Zagent Node';
 $lang->action->dynamicAction->zanode['resume']  = 'Resume Zagent Node';

module/action/lang/vi.php

@@ -89,7 +89,6 @@ $lang->action->objectTypes['testsuite']        = 'Suite';
 $lang->action->objectTypes['testtask']         = 'Test bản dựng';
 $lang->action->objectTypes['testreport']       = 'Báo cáo';
 $lang->action->objectTypes['zahost']           = 'Host';
-$lang->action->objectTypes['vmtemplate']       = 'Virtual Host Template';
 $lang->action->objectTypes['zanode']           = 'ZA Node';
 $lang->action->objectTypes['doc']              = 'Tài liệu';
 $lang->action->objectTypes['doclib']           = 'Thư viện tài liệu';
@@ -496,8 +495,6 @@ $lang->action->dynamicAction->caselib['hidden']    = 'Ẩn Case Lib';
 
 $lang->action->dynamicAction->zahost['created'] = 'Create Host';
 
-$lang->action->dynamicAction->vmtemplate['created'] = 'Create Virtual Host Template';
-
 $lang->action->dynamicAction->zanode['created'] = 'Create Zagent Node';
 $lang->action->dynamicAction->zanode['suspend'] = 'Suspend Zagent Node';
 $lang->action->dynamicAction->zanode['resume']  = 'Resume Zagent Node';

module/action/lang/zh-cn.php

@@ -640,8 +640,6 @@ $lang->action->dynamicAction->caselib['hidden']    = '隐藏用例库';
 
 $lang->action->dynamicAction->zahost['created'] = '创建宿主机';
 
-$lang->action->dynamicAction->vmtemplate['created'] = '创建虚拟机模板';
-
 $lang->action->dynamicAction->zanode['created'] = '创建执行节点';
 $lang->action->dynamicAction->zanode['suspend'] = '暂停执行节点';
 $lang->action->dynamicAction->zanode['resume']  = '恢复执行节点';

module/zahost/view/browse.html.php

@@ -64,7 +64,7 @@
           <td><?php echo $host->extranet;?></td>
           <td><?php echo $host->cpuCores;?></td>
           <td><?php echo $host->memory . $lang->zahost->unitList['GB'];?></td>
-          <td><?php echo $host->diskSize . zget($lang->zahost->unitList, $host->unit);?></td>
+          <td><?php echo $host->diskSize . $lang->zahost->unitList['GB'];?></td>
           <td><?php echo $host->vsoft;?></td>
           <td><?php echo zget($lang->host->statusList, $host->status);?></td>
           <td><?php echo helper::isZeroDate($host->heartbeat) ? '' : $host->heartbeat;?></td>

module/zahost/view/editimage.html.php

@@ -1,80 +0,0 @@
-<?php
-/**
- * The create vm template view file of zahost module of ZenTaoPMS.
- *
- * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
- * @license     ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
- * @author      Jianhua Wang<wangjianhua@easycorp.ltd>
- * @package     zahost
- * @version     $Id$
- * @link        http://www.zentao.net
- */
-?>
-<?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
-<?php js::set('zahostConfig', $config->zahost);?>
-<?php js::set('zahostLang', $lang->zahost);?>
-<?php js::set('template', $template);?>
-<?php js::set('hostID', $template->hostID);?>
-<div id='mainContent' class='main-content'>
-  <div class='main-header'>
-    <h2><?php echo $lang->zahost->createTemplate;?></h2>
-  </div>
-  <form method='post' target='hiddenwin' id='ajaxForm' class="load-indicator main-form form-ajax">
-    <table class='table table-form'>
-      <tr>
-        <th class='w-120px'><?php echo $lang->zahost->name;?></th>
-        <td><?php echo html::input('name', $template->name, "class='form-control'");?></td>
-        <td></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->zahost->cpu         ;?></th>
-        <td><?php echo html::input('cpuCoreNum', $template->cpuCoreNum, "class='form-control'");?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->zahost->memory;?></th>
-        <td>
-          <div class='input-group'>
-            <?php echo html::input('memorySize', $template->memorySize, "class='form-control'");?>
-            <span class='input-group-addon'>MB</span>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->zahost->disk;?></th>
-        <td>
-          <div class='input-group'>
-            <?php echo html::input('diskSize', intval($template->diskSize/1024), "class='form-control'");?>
-            <span class='input-group-addon' id='unit'>GB</span>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->zahost->vmTemplate->osCategory;?></th>
-        <td><?php echo html::select('osCategory', $config->zahost->os->list, $template->osCategory, "class='form-control chosen'")?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->zahost->vmTemplate->osType;?></th>
-        <td><?php echo html::select('osType', '', $template->osType, "class='form-control chosen'")?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->zahost->vmTemplate->osVersion;?></th>
-        <td><?php echo html::select('osVersion', '', $template->osVersion, "class='form-control chosen'")?></td>
-      </tr>
-      <tr>
-        <th><?php echo $lang->zahost->vmTemplate->osLang;?></th>
-        <td><?php echo html::select('osLang', $lang->zahost->langList, $template->osLang, "class='form-control chosen'")?></td>
-      <tr>
-        <th><?php echo $lang->zahost->vmTemplate->imageName;?></th>
-        <td><?php echo html::select('imageName', $imageOptions, $template->imageName, "class='form-control chosen'")?></td>
-      </tr>
-      <tr>
-        <td colspan='2' class='text-center form-actions'>
-          <?php echo html::submitButton();?>
-          <?php echo html::backButton();?>
-          <?php echo html::hidden('type', 'za');?>
-        </td>
-      </tr>
-    </table>
-  </form>
-</div>
-<?php include $app->getModuleRoot() . 'common/view/footer.html.php';?>

test/data/zentao/config.php

@@ -121,6 +121,4 @@ $builder->oauth    = array('rows' => 100, 'extends' => array('oauth'));
 $builder->notify   = array('rows' => 10,  'extends' => array('notify'));
 
 $builder->vm         = array('rows' => 1,  'extends' => array('vm'));
-$builder->vmtemplate = array('rows' => 1,  'extends' => array('vmtemplate'));
 $builder->host       = array('rows' => 1,  'extends' => array('host'));
-$builder->asset      = array('rows' => 1,  'extends' => array('asset'));