From 2129b39ac3ee98ac4e5ee31b274deb7074c72a78 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Thu, 19 Oct 2023 01:32:30 +0000
Subject: [PATCH] * Adjust code.

---
 module/instance/config.php                |  2 +-
 module/instance/control.php               |  1 +
 module/instance/model.php                 |  5 +-
 module/solution/lang/de.php               | 64 +++++++++++++++++++++++
 module/solution/lang/en.php               | 64 +++++++++++++++++++++++
 module/solution/lang/fr.php               | 64 +++++++++++++++++++++++
 module/solution/lang/zh-cn.php            |  1 +
 module/solution/model.php                 | 15 +++++-
 module/sonarqube/control.php              |  3 +-
 module/sonarqube/view/reportview.html.php |  6 ++-
 module/zahost/config/dtable.php           |  2 +-
 module/zahost/ui/browse.html.php          |  1 +
 module/zanode/config/dtable.php           | 30 ++++++-----
 module/zanode/model.php                   |  6 ++-
 module/zanode/ui/browse.html.php          |  2 +-
 15 files changed, 244 insertions(+), 22 deletions(-)
 create mode 100644 module/solution/lang/de.php
 create mode 100644 module/solution/lang/en.php
 create mode 100644 module/solution/lang/fr.php

diff --git a/module/instance/config.php b/module/instance/config.php
index 3c893d7600..7c1981f13d 100644
--- a/module/instance/config.php
+++ b/module/instance/config.php
@@ -59,4 +59,4 @@ $config->instance->actions->view = array();
 $config->instance->actions->view['mainActions']   = array('visit', 'ajaxStart', 'ajaxStop', 'upgrade');
 $config->instance->actions->view['suffixActions'] = array('ajaxUninstall');
 
-$config->instance->devopsApps = array('gitea', 'gitlab', 'jenkins', 'sonarqube', 'nexus3');
+$config->instance->devopsApps = array('gitea', 'gitlab', 'jenkins', 'sonarqube', 'nexus3', 'nexus');
diff --git a/module/instance/control.php b/module/instance/control.php
index 27858a96e0..a22d6936b8 100644
--- a/module/instance/control.php
+++ b/module/instance/control.php
@@ -594,6 +594,7 @@ class instance extends control
                 $sharedDB = zget($pgList, $customData->dbService);
             }
             $instance = $this->instance->install($cloudApp, $sharedDB, $customData);
+            if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
             if(!$instance) return $this->send(array('result' => 'fail', 'message' => $this->lang->instance->notices['installFail']));
 
             unset($_GET['onlybody']);
diff --git a/module/instance/model.php b/module/instance/model.php
index 61de2a5cc4..ba71875b4d 100644
--- a/module/instance/model.php
+++ b/module/instance/model.php
@@ -996,6 +996,7 @@ class InstanceModel extends model
         if($result->code != 200)
         {
             $this->dao->delete()->from(TABLE_INSTANCE)->where('id')->eq($instance->id)->exec();
+            dao::$errors['server'][] = $result->message;
             return false;
         }
 
@@ -1177,6 +1178,8 @@ class InstanceModel extends model
                     ->autoCheck()
                     ->exec();
                 $instance->status = $statusData->status;
+
+                if($instance->status == 'running') $this->saveAuthInfo($instance);
             }
 
             $status = new stdclass;
@@ -2135,7 +2138,7 @@ class InstanceModel extends model
 
         $pipeline = new stdclass();
         $instance->type        = $instance->chart;
-        $pipeline->type        = $instance->type;
+        $pipeline->type        = $instance->type == 'nexus3' ? 'nexus' : $instance->type;
         $pipeline->private     = md5(strval(rand(10,113450)));
         $pipeline->createdBy   = 'system';
         $pipeline->createdDate = helper::now();
diff --git a/module/solution/lang/de.php b/module/solution/lang/de.php
new file mode 100644
index 0000000000..cce02bded4
--- /dev/null
+++ b/module/solution/lang/de.php
@@ -0,0 +1,64 @@
+<?php
+$lang->solution->market = new stdclass;
+$lang->solution->market->browse = 'Solution Market';
+$lang->solution->market->view   = 'Solution Detail';
+
+$lang->solution->name = 'Name';
+
+$lang->solution->browse        = 'Installed';
+$lang->solution->view          = 'Solution Detail';
+$lang->solution->detail        = 'Detail';
+$lang->solution->progress      = 'Progress';
+$lang->solution->install       = 'Install';
+$lang->solution->background    = 'Background';
+$lang->solution->cancelInstall = 'Cancel';
+$lang->solution->uninstall     = 'Uninstall';
+$lang->solution->retryInstall  = 'Retry';
+$lang->solution->nextStep      = 'Next';
+$lang->solution->config        = 'Config';
+
+$lang->solution->introduction = 'Introduction';
+$lang->solution->scenes       = 'Scenes';
+$lang->solution->diagram      = 'Diagram';
+$lang->solution->includedApp  = 'Included App';
+$lang->solution->features     = 'Features';
+$lang->solution->relatedLinks = 'Related Links';
+$lang->solution->customers    = 'Customers';
+$lang->solution->apps         = 'Installed Apps';
+$lang->solution->externalApps = 'External Apps';
+$lang->solution->resources    = 'Resources';
+
+$lang->solution->editName = 'Edit Name';
+
+$lang->solution->chooseApp           = 'Choose App';
+$lang->solution->noInstalledSolution = 'No installed solution';
+$lang->solution->toInstall           = 'To Install';
+
+$lang->solution->notices = new stdclass;
+$lang->solution->notices->fail                 = 'Fail';
+$lang->solution->notices->success              = 'Success';
+$lang->solution->notices->creatingSolution     = 'Creating solution...';
+$lang->solution->notices->uninstallingSolution = 'Uninstalling solution...';
+$lang->solution->notices->installingApp        = 'Installing: ';
+$lang->solution->notices->installationSuccess  = 'Installation success!';
+$lang->solution->notices->cancelInstall        = 'Are you sure to cancel installation?';
+$lang->solution->notices->confirmToUninstall   = 'Are you sure to uninstall?';
+$lang->solution->notices->confirmReinstall     = 'Are you sure to retry installation?';
+
+$lang->solution->errors = new stdclass;
+$lang->solution->errors->error                = 'Error';
+$lang->solution->errors->notFound             = 'Not found';
+$lang->solution->errors->failToInstallApp     = 'Fail to install %s';
+$lang->solution->errors->timeout              = 'Timeout';
+$lang->solution->errors->failToUninstallApp   = 'Fail to uninstall %s';
+$lang->solution->errors->hasInstallationError = 'Has installation error';
+$lang->solution->errors->notFoundAppByVersion = 'Not found %s version of %s';
+$lang->solution->errors->notEnoughResource    = 'Not enough resource, please increase the configuration or release other resources and try again.';
+
+$lang->solution->installationErrors = array();
+$lang->solution->installationErrors['waiting']           = 'Installation not started.';
+$lang->solution->installationErrors['uninstalling']      = 'Installation canceled.';
+$lang->solution->installationErrors['cneError']          = 'Installation failed.';
+$lang->solution->installationErrors['timeout']           = 'Installation timeout.';
+$lang->solution->installationErrors['notFoundApp']       = 'Not found app to be installed.';
+$lang->solution->installationErrors['notEnoughResource'] = 'Not enough resource, please increase the configuration or release other resources and try again.';
diff --git a/module/solution/lang/en.php b/module/solution/lang/en.php
new file mode 100644
index 0000000000..cce02bded4
--- /dev/null
+++ b/module/solution/lang/en.php
@@ -0,0 +1,64 @@
+<?php
+$lang->solution->market = new stdclass;
+$lang->solution->market->browse = 'Solution Market';
+$lang->solution->market->view   = 'Solution Detail';
+
+$lang->solution->name = 'Name';
+
+$lang->solution->browse        = 'Installed';
+$lang->solution->view          = 'Solution Detail';
+$lang->solution->detail        = 'Detail';
+$lang->solution->progress      = 'Progress';
+$lang->solution->install       = 'Install';
+$lang->solution->background    = 'Background';
+$lang->solution->cancelInstall = 'Cancel';
+$lang->solution->uninstall     = 'Uninstall';
+$lang->solution->retryInstall  = 'Retry';
+$lang->solution->nextStep      = 'Next';
+$lang->solution->config        = 'Config';
+
+$lang->solution->introduction = 'Introduction';
+$lang->solution->scenes       = 'Scenes';
+$lang->solution->diagram      = 'Diagram';
+$lang->solution->includedApp  = 'Included App';
+$lang->solution->features     = 'Features';
+$lang->solution->relatedLinks = 'Related Links';
+$lang->solution->customers    = 'Customers';
+$lang->solution->apps         = 'Installed Apps';
+$lang->solution->externalApps = 'External Apps';
+$lang->solution->resources    = 'Resources';
+
+$lang->solution->editName = 'Edit Name';
+
+$lang->solution->chooseApp           = 'Choose App';
+$lang->solution->noInstalledSolution = 'No installed solution';
+$lang->solution->toInstall           = 'To Install';
+
+$lang->solution->notices = new stdclass;
+$lang->solution->notices->fail                 = 'Fail';
+$lang->solution->notices->success              = 'Success';
+$lang->solution->notices->creatingSolution     = 'Creating solution...';
+$lang->solution->notices->uninstallingSolution = 'Uninstalling solution...';
+$lang->solution->notices->installingApp        = 'Installing: ';
+$lang->solution->notices->installationSuccess  = 'Installation success!';
+$lang->solution->notices->cancelInstall        = 'Are you sure to cancel installation?';
+$lang->solution->notices->confirmToUninstall   = 'Are you sure to uninstall?';
+$lang->solution->notices->confirmReinstall     = 'Are you sure to retry installation?';
+
+$lang->solution->errors = new stdclass;
+$lang->solution->errors->error                = 'Error';
+$lang->solution->errors->notFound             = 'Not found';
+$lang->solution->errors->failToInstallApp     = 'Fail to install %s';
+$lang->solution->errors->timeout              = 'Timeout';
+$lang->solution->errors->failToUninstallApp   = 'Fail to uninstall %s';
+$lang->solution->errors->hasInstallationError = 'Has installation error';
+$lang->solution->errors->notFoundAppByVersion = 'Not found %s version of %s';
+$lang->solution->errors->notEnoughResource    = 'Not enough resource, please increase the configuration or release other resources and try again.';
+
+$lang->solution->installationErrors = array();
+$lang->solution->installationErrors['waiting']           = 'Installation not started.';
+$lang->solution->installationErrors['uninstalling']      = 'Installation canceled.';
+$lang->solution->installationErrors['cneError']          = 'Installation failed.';
+$lang->solution->installationErrors['timeout']           = 'Installation timeout.';
+$lang->solution->installationErrors['notFoundApp']       = 'Not found app to be installed.';
+$lang->solution->installationErrors['notEnoughResource'] = 'Not enough resource, please increase the configuration or release other resources and try again.';
diff --git a/module/solution/lang/fr.php b/module/solution/lang/fr.php
new file mode 100644
index 0000000000..cce02bded4
--- /dev/null
+++ b/module/solution/lang/fr.php
@@ -0,0 +1,64 @@
+<?php
+$lang->solution->market = new stdclass;
+$lang->solution->market->browse = 'Solution Market';
+$lang->solution->market->view   = 'Solution Detail';
+
+$lang->solution->name = 'Name';
+
+$lang->solution->browse        = 'Installed';
+$lang->solution->view          = 'Solution Detail';
+$lang->solution->detail        = 'Detail';
+$lang->solution->progress      = 'Progress';
+$lang->solution->install       = 'Install';
+$lang->solution->background    = 'Background';
+$lang->solution->cancelInstall = 'Cancel';
+$lang->solution->uninstall     = 'Uninstall';
+$lang->solution->retryInstall  = 'Retry';
+$lang->solution->nextStep      = 'Next';
+$lang->solution->config        = 'Config';
+
+$lang->solution->introduction = 'Introduction';
+$lang->solution->scenes       = 'Scenes';
+$lang->solution->diagram      = 'Diagram';
+$lang->solution->includedApp  = 'Included App';
+$lang->solution->features     = 'Features';
+$lang->solution->relatedLinks = 'Related Links';
+$lang->solution->customers    = 'Customers';
+$lang->solution->apps         = 'Installed Apps';
+$lang->solution->externalApps = 'External Apps';
+$lang->solution->resources    = 'Resources';
+
+$lang->solution->editName = 'Edit Name';
+
+$lang->solution->chooseApp           = 'Choose App';
+$lang->solution->noInstalledSolution = 'No installed solution';
+$lang->solution->toInstall           = 'To Install';
+
+$lang->solution->notices = new stdclass;
+$lang->solution->notices->fail                 = 'Fail';
+$lang->solution->notices->success              = 'Success';
+$lang->solution->notices->creatingSolution     = 'Creating solution...';
+$lang->solution->notices->uninstallingSolution = 'Uninstalling solution...';
+$lang->solution->notices->installingApp        = 'Installing: ';
+$lang->solution->notices->installationSuccess  = 'Installation success!';
+$lang->solution->notices->cancelInstall        = 'Are you sure to cancel installation?';
+$lang->solution->notices->confirmToUninstall   = 'Are you sure to uninstall?';
+$lang->solution->notices->confirmReinstall     = 'Are you sure to retry installation?';
+
+$lang->solution->errors = new stdclass;
+$lang->solution->errors->error                = 'Error';
+$lang->solution->errors->notFound             = 'Not found';
+$lang->solution->errors->failToInstallApp     = 'Fail to install %s';
+$lang->solution->errors->timeout              = 'Timeout';
+$lang->solution->errors->failToUninstallApp   = 'Fail to uninstall %s';
+$lang->solution->errors->hasInstallationError = 'Has installation error';
+$lang->solution->errors->notFoundAppByVersion = 'Not found %s version of %s';
+$lang->solution->errors->notEnoughResource    = 'Not enough resource, please increase the configuration or release other resources and try again.';
+
+$lang->solution->installationErrors = array();
+$lang->solution->installationErrors['waiting']           = 'Installation not started.';
+$lang->solution->installationErrors['uninstalling']      = 'Installation canceled.';
+$lang->solution->installationErrors['cneError']          = 'Installation failed.';
+$lang->solution->installationErrors['timeout']           = 'Installation timeout.';
+$lang->solution->installationErrors['notFoundApp']       = 'Not found app to be installed.';
+$lang->solution->installationErrors['notEnoughResource'] = 'Not enough resource, please increase the configuration or release other resources and try again.';
diff --git a/module/solution/lang/zh-cn.php b/module/solution/lang/zh-cn.php
index 1220e55343..b3297110a7 100644
--- a/module/solution/lang/zh-cn.php
+++ b/module/solution/lang/zh-cn.php
@@ -10,6 +10,7 @@ $lang->solution->view          = '解决方案详情';
 $lang->solution->detail        = '查看';
 $lang->solution->progress      = '安装进度';
 $lang->solution->install       = '安装';
+$lang->solution->background    = '后台安装';
 $lang->solution->cancelInstall = '取消安装';
 $lang->solution->uninstall     = '卸载';
 $lang->solution->retryInstall  = '重试';
diff --git a/module/solution/model.php b/module/solution/model.php
index acf8f8ad02..e041b67014 100644
--- a/module/solution/model.php
+++ b/module/solution/model.php
@@ -82,6 +82,12 @@ class solutionModel extends model
             if(empty($selectedApps[$category])) unset($selectedApps[$category]);
         }
 
+        if(!$this->app->user->account)
+        {
+            $this->app->user = new stdclass();
+            $this->app->user->account = $this->dao->select('*')->from(TABLE_USER)->where('deleted')->eq(0)->fetch('account');
+        }
+
         /* Create solution. */
         $solution = new stdclass;
         $solution->name         = $cloudSolution->title;
@@ -171,6 +177,7 @@ class solutionModel extends model
         $solutionSchema = $this->loadModel('store')->solutionConfig('id', $solution->appID);
         $channel        = $this->app->session->cloudChannel ? $this->app->session->cloudChannel : $this->config->cloud->api->channel;
         $components     = json_decode($solution->components);
+        $apps           = helper::arrayColumn(json_decode($solution->components, true), 'chart');
         foreach($components as $categorty => $componentApp)
         {
             $solutionStatus = $this->dao->select('status')->from(TABLE_SOLUTION)->where('id')->eq($solutionID)->fetch();
@@ -211,7 +218,7 @@ class solutionModel extends model
                     }
 
                     if(!$this->checkInstallStatus($solutionID)) return false;
-                    $settings = $this->mountSettings($solutionSchema, $componentApp->chart, $components, $allMappings, isset($components->sonarqube));
+                    $settings = $this->mountSettings($solutionSchema, $componentApp->chart, $components, $allMappings, in_array('sonarqube', $apps));
                     $instance = $this->installApp($cloudApp, $settings);
                 }
 
@@ -250,6 +257,7 @@ class solutionModel extends model
                 }
                 $componentApp->status = 'installed';
                 $this->dao->update(TABLE_SOLUTION)->set('components')->eq(json_encode($components))->where('id')->eq($solution->id)->exec();
+                $this->instance->saveAuthInfo($instance);
             }
             else
             {
@@ -291,8 +299,10 @@ class solutionModel extends model
         $settings = array();
 
         $appSettings = zget($solutionSchema->settings, $chart, array());
+        $apps        = helper::arrayColumn((array)$components, 'chart');
         foreach($appSettings as $item)
         {
+            if(!empty($item->when) && !in_array($item->when, $apps)) continue;
             switch($item->type)
             {
                 case 'static':
@@ -308,6 +318,9 @@ class solutionModel extends model
                     $mappingInfo = zget($mappings, $item->target, '');
                     if($mappingInfo) $settings[] = array('key' => $item->key, 'value' => zget($mappingInfo, $item->key, ''));
                     break;
+                case 'auto':
+                    if($item->value === 'protocol') $settings[] = array('key' => $item->key, 'value' => strstr(getWebRoot(true), ':', true));
+                    break;
             }
         }
 
diff --git a/module/sonarqube/control.php b/module/sonarqube/control.php
index 5051ee8f5d..c795a4f597 100644
--- a/module/sonarqube/control.php
+++ b/module/sonarqube/control.php
@@ -96,6 +96,7 @@ class sonarqube extends control
         $this->view->measures    = $measures;
         $this->view->qualitygate = $qualitygate;
         $this->view->projectName = $projectName;
+        $this->view->projectKey  = $job->projectKey;
         $this->view->sonarqubeID = $job->sonarqubeServer;
 
         $this->display();
@@ -119,7 +120,6 @@ class sonarqube extends control
             $options[] = array('text' => $projectName, 'value' => $productKey);
         }
         return print(json_encode($options));
-        //echo html::select('projectKey', $projectPairs, str_replace('*', '-', $projectKey), "class='form-control chosen'");
     }
 
     /**
@@ -381,6 +381,7 @@ class sonarqube extends control
      */
     public function browseIssue($sonarqubeID, $projectKey = '', $search = false, $orderBy = 'severity_desc', $recPerPage = 100, $pageID = 1)
     {
+        $projectKey = str_replace('*', '-', $projectKey);
         if(isset($_POST['keyword']))
         {
             $keyword = htmlspecialchars(trim($_POST['keyword']));
diff --git a/module/sonarqube/view/reportview.html.php b/module/sonarqube/view/reportview.html.php
index 7c3be1835e..c37e82dd2d 100644
--- a/module/sonarqube/view/reportview.html.php
+++ b/module/sonarqube/view/reportview.html.php
@@ -14,13 +14,15 @@
 <div id='mainContent' class='main-content'>
   <?php unset($_GET['onlybody']);?>
   <?php if(empty($measures)): ?>
-    <div class='empty-tip'><?php echo $lang->sonarqube->noReport;?></div>
+  <div class="table-empty-tip">
+    <p><span class="text-muted"><?php echo $lang->sonarqube->noReport;?></span></p>
+  </div>
   <?php else:?>
   <div class="main-header">
     <div class="page-title">
       <span class='text' title="<?php echo $projectName;?>">
         <h4>
-          <?php echo common::hasPriv('sonarqube', 'browseIssue') ? html::a($this->createLink('sonarqube', 'browseIssue', "sonarqubeID={$sonarqubeID}&project={$projectName}"), $projectName, '_parent') : $projectName;?>
+          <?php echo common::hasPriv('sonarqube', 'browseIssue') ? html::a($this->createLink('sonarqube', 'browseIssue', "sonarqubeID={$sonarqubeID}&project=" . str_replace('-', '*', $projectKey)), $projectName, '_parent') : $projectName;?>
           <?php if(!empty($qualitygate->projectStatus->status) and $qualitygate->projectStatus->status != 'NONE'):?>
           <span class="label label-badge label-<?php echo zget($config->sonarqube->projectStatusClass, $qualitygate->projectStatus->status);?>">
             <?php echo zget($lang->sonarqube->qualitygateList, $qualitygate->projectStatus->status);?>
diff --git a/module/zahost/config/dtable.php b/module/zahost/config/dtable.php
index 762456b7b0..be17bbe6c0 100644
--- a/module/zahost/config/dtable.php
+++ b/module/zahost/config/dtable.php
@@ -7,7 +7,7 @@ $config->zahost->dtable->fieldList['id']['title'] = $lang->idAB;
 $config->zahost->dtable->fieldList['id']['name']  = 'hostID';
 $config->zahost->dtable->fieldList['id']['type']  = 'id';
 
-$config->zahost->dtable->fieldList['name']['type'] = 'title';
+$config->zahost->dtable->fieldList['name']['type'] = 'name';
 $config->zahost->dtable->fieldList['name']['link'] = array('module' => 'zahost', 'method' => 'view', 'params' => 'id={hostID}');
 
 $config->zahost->dtable->fieldList['type']['name']     = 'hostType';
diff --git a/module/zahost/ui/browse.html.php b/module/zahost/ui/browse.html.php
index d988e0d9d7..0cd60b132c 100644
--- a/module/zahost/ui/browse.html.php
+++ b/module/zahost/ui/browse.html.php
@@ -54,6 +54,7 @@ dtable
     set::afterRender(jsRaw('window.afterRender')),
     set::sortLink(jsRaw('createSortLink')),
     set::footPager(usePager()),
+    set::orderBy(str_replace('id_', 'hostID_', $orderBy)),
 );
 
 render();
diff --git a/module/zanode/config/dtable.php b/module/zanode/config/dtable.php
index a9692f41ee..749a64c281 100644
--- a/module/zanode/config/dtable.php
+++ b/module/zanode/config/dtable.php
@@ -7,11 +7,12 @@ $config->zanode->dtable = new stdclass();
 $config->zanode->dtable->fieldList['id']['title'] = $lang->idAB;
 $config->zanode->dtable->fieldList['id']['type']  = 'id';
 
-$config->zanode->dtable->fieldList['name']['type'] = 'title';
+$config->zanode->dtable->fieldList['name']['type'] = 'name';
 $config->zanode->dtable->fieldList['name']['link'] = array('module' => 'zanode', 'method' => 'view', 'params' => 'id={id}');
 
-$config->zanode->dtable->fieldList['type']['name']  = 'hostType';
-$config->zanode->dtable->fieldList['type']['title'] = $lang->zahost->type;
+$config->zanode->dtable->fieldList['type']['name']     = 'hostType';
+$config->zanode->dtable->fieldList['type']['title']    = $lang->zahost->type;
+$config->zanode->dtable->fieldList['type']['map']      = array('physics' => $this->lang->zanode->typeList['physics'], 'physical' => $this->lang->zanode->typeList['node']);
 $config->zanode->dtable->fieldList['type']['sortType'] = true;
 
 $config->zanode->dtable->fieldList['extranet']['name'] = 'extranet';
@@ -26,7 +27,7 @@ $config->zanode->dtable->fieldList['memory']['sortType'] = true;
 $config->zanode->dtable->fieldList['diskSize']['name']     = 'diskSize';
 $config->zanode->dtable->fieldList['diskSize']['sortType'] = true;
 
-$config->zanode->dtable->fieldList['osName']['name'] = 'osName';
+$config->zanode->dtable->fieldList['osName']['name']  = 'osName';
 
 $config->zanode->dtable->fieldList['status']['name']     = 'status';
 $config->zanode->dtable->fieldList['status']['map']      = $lang->zanode->statusList;
@@ -38,7 +39,7 @@ $config->zanode->dtable->fieldList['hostName']['sortType'] = true;
 $config->zanode->dtable->fieldList['actions']['name']  = 'actions';
 $config->zanode->dtable->fieldList['actions']['title'] = $lang->actions;
 $config->zanode->dtable->fieldList['actions']['type']  = 'actions';
-$config->zanode->dtable->fieldList['actions']['menu']  = array('getVNC', 'resume|suspend', 'start|close', 'reboot', 'createSnapshot', 'more' => array('edit'));
+$config->zanode->dtable->fieldList['actions']['menu']  = array('getVNC', 'resume|suspend', 'start|close', 'reboot', 'createSnapshot', 'more' => array('edit', 'createImage', 'destroy'));
 
 $config->zanode->dtable->fieldList['actions']['list']['getVNC']['icon']   = 'remote';
 $config->zanode->dtable->fieldList['actions']['list']['getVNC']['hint']   = $lang->zanode->getVNC;
@@ -76,11 +77,16 @@ $config->zanode->dtable->fieldList['actions']['list']['createSnapshot']['url']
 $config->zanode->dtable->fieldList['actions']['list']['createSnapshot']['data-toggle'] = 'modal';
 $config->zanode->dtable->fieldList['actions']['list']['createSnapshot']['className']   = 'create-snapshot';
 
-$config->zanode->dtable->fieldList['actions']['list']['more']['icon']      = 'ellipsis-v';
-$config->zanode->dtable->fieldList['actions']['list']['more']['hint']      = 'more';
-$config->zanode->dtable->fieldList['actions']['list']['more']['type']      = 'dropdown';
-$config->zanode->dtable->fieldList['actions']['list']['more']['caret']      = false;
+$config->zanode->dtable->fieldList['actions']['list']['edit']['icon'] = 'edit';
+$config->zanode->dtable->fieldList['actions']['list']['edit']['hint'] = $lang->zanode->edit;
+$config->zanode->dtable->fieldList['actions']['list']['edit']['url']  = array('module' => 'zanode', 'method' => 'edit', 'params' => 'zanodeID={id}');
 
-$config->zanode->dtable->fieldList['actions']['list']['edit']['icon']      = 'edit';
-$config->zanode->dtable->fieldList['actions']['list']['edit']['hint']      = $lang->zanode->edit;
-$config->zanode->dtable->fieldList['actions']['list']['edit']['url']       = array('module' => 'zanode', 'method' => 'edit', 'params' => 'zanodeID={id}');
+$config->zanode->dtable->fieldList['actions']['list']['createImage']['icon']        = 'export';
+$config->zanode->dtable->fieldList['actions']['list']['createImage']['hint']        = $lang->zanode->createImage;
+$config->zanode->dtable->fieldList['actions']['list']['createImage']['url']         = array('module' => 'zanode', 'method' => 'createImage', 'params' => 'zanodeID={id}');
+$config->zanode->dtable->fieldList['actions']['list']['createImage']['data-toggle'] = 'modal';
+
+$config->zanode->dtable->fieldList['actions']['list']['destroy']['icon']      = 'trash';
+$config->zanode->dtable->fieldList['actions']['list']['destroy']['hint']      = $lang->zanode->destory;
+$config->zanode->dtable->fieldList['actions']['list']['destroy']['url']       = array('module' => 'zanode', 'method' => 'destory', 'params' => 'zanodeID={id}');
+$config->zanode->dtable->fieldList['actions']['list']['destroy']['className'] = 'ajax-submit';
diff --git a/module/zanode/model.php b/module/zanode/model.php
index 1685a8c1b5..bb60e0e800 100644
--- a/module/zanode/model.php
+++ b/module/zanode/model.php
@@ -1160,7 +1160,7 @@ class zanodemodel extends model
      * 判断按钮是否可点击。
      * Judge an action is clickable or not.
      *
-     * @param  object $host
+     * @param  object $node
      * @param  string $action
      * @access public
      * @return bool
@@ -1173,9 +1173,11 @@ class zanodemodel extends model
         if($action == 'start')  return $node->status == 'shutoff' && $node->hostType != 'physics' && !in_array($node->status, array('wait', 'creating_img', 'creating_snap', 'restoring'));
         if($action == 'close')  return $node->status != 'shutoff' && $node->hostType != 'physics' && !in_array($node->status, array('wait', 'creating_img', 'creating_snap', 'restoring'));
 
-        if($action == 'getVNC')  return $node->hostType == '' && in_array($node->status ,array('running', 'launch', 'wait'));
+        if($action == 'getVNC') return $node->hostType == '' && in_array($node->status ,array('running', 'launch', 'wait'));
         if($action == 'reboot') return $node->hostType != 'physics' && !in_array($node->status, array('wait', 'creating_img', 'creating_snap', 'restoring', 'shutoff'));
+
         if($action == 'createSnapshot') return $node->hostType != 'physics' && $node->status == 'running';
+        if($action == 'createImage')    return $node->hostType != 'physics' && $node->status == 'running';
 
         return true;
     }
diff --git a/module/zanode/ui/browse.html.php b/module/zanode/ui/browse.html.php
index 737eea89cd..0916e601e6 100644
--- a/module/zanode/ui/browse.html.php
+++ b/module/zanode/ui/browse.html.php
@@ -49,7 +49,7 @@ dtable
     set::afterRender(jsRaw('window.afterRender')),
     set::sortLink(jsRaw('createSortLink')),
     set::footPager(usePager()),
-    set::orderBy($orderBy),
+    set::orderBy(str_replace('t1.', '', $orderBy)),
 );
 
 render();