Merge branch 'zenops_46' into 'master'

* Fix bug #31322.

See merge request easycorp/zentaopms!6688

module/qa/model.php

@@ -37,6 +37,7 @@ class qaModel extends model
 
         if(!in_array($this->app->rawModule, $this->config->qa->noDropMenuModule)) $this->lang->switcherMenu = $this->product->getSwitcher($productID, $extra, $branch);
         if($this->app->rawModule == 'product' and $this->app->rawMethod == 'showerrornone') $this->lang->switcherMenu = '';
+        if(!common::hasPriv('zahost', 'browse') and !common::hasPriv('zanode', 'browse')) unset($this->lang->qa->menu->automation);
         common::setMenuVars('qa', $productID);
     }
 

module/zahost/config.php

@@ -50,6 +50,7 @@ $config->zahost->search['params']['editedDate']      = array('operator' => '=',
 $config->zahost->editor = new stdclass();
 $config->zahost->editor->create = array('id' => 'desc', 'tools' => 'simpleTools');
 $config->zahost->editor->edit   = array('id' => 'desc', 'tools' => 'simpleTools');
+$config->zahost->editor->view   = array('id' => 'comment', 'tools' => 'simpleTools');
 
 $config->zahost->automation = new stdclass();
 $config->zahost->automation->zenAgentURL   = 'https://github.com/easysoft/zenagent/blob/main/guide/deploy/index.md';

module/zahost/view/view.html.php

@@ -18,7 +18,8 @@
 <?php $vars = "id={$zahost->hostID}&orderBy=%s";?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <?php echo html::backButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, "data-app='{$app->tab}'", 'btn btn-secondary');?>
+    <?php $browseLink = inLink('browse');?>
+    <?php echo html::linkButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, $browseLink, 'self', "data-app='{$app->tab}'", 'btn btn-secondary');?>
     <div class='divider'></div>
     <div class='page-title'>
       <span class='label label-id'><?php echo $zahost->id;?></span>

module/zanode/config.php

@@ -46,6 +46,7 @@ $config->zanode->search['params']['memory']     = array('operator' => '=', 'cont
 $config->zanode->search['params']['diskSize']   = array('operator' => '=', 'control' => 'input',  'values' => '');
 
 $config->zanode->editor = new stdclass();
-$config->zanode->editor->create = array('id' => 'desc', 'tools' => 'simpleTools');
-$config->zanode->editor->edit   = array('id' => 'desc', 'tools' => 'simpleTools');
+$config->zanode->editor->create      = array('id' => 'desc', 'tools' => 'simpleTools');
+$config->zanode->editor->edit        = array('id' => 'desc', 'tools' => 'simpleTools');
 $config->zanode->editor->createimage = array('id' => 'desc', 'tools' => 'simpleTools');
+$config->zanode->editor->view        = array('id' => 'comment', 'tools' => 'simpleTools');

module/zanode/view/browse.html.php

@@ -88,7 +88,7 @@
                 common::printLink('zanode', 'getVNC', "id={$node->id}", "<i class='icon icon-remote'></i> ", '_blank', "title='{$lang->zanode->getVNC}' class='btn desktop  " . (in_array($node->status ,array('running', 'launch', 'wait')) ? '':'disabled') . "'", '');
                 if($node->status == "suspend")
                 {
-                    common::printLink('zanode', 'resume', "zanodeID={$node->id}", "<i class='icon icon-spinner-indicator'></i> ", '', $resumeAttr);
+                    common::printLink('zanode', 'resume', "zanodeID={$node->id}", "<i class='icon icon-resume'></i> ", '', $resumeAttr);
                 }
                 else
                 {
@@ -107,13 +107,16 @@
                 common::printLink('zanode', 'reboot', "zanodeID={$node->id}", "<i class='icon icon-restart'></i> ", '', $rebootAttr);
                 common::printIcon('zanode', 'edit', "id={$node->id}", $node, 'list');
 
-                echo "<div class='btn-group'>";
-                echo "<button type='button' class='btn dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}'><i class='icon-ellipsis-v'></i></button>";
-                echo "<ul class='dropdown-menu pull-right text-center' role='menu'>";
-                common::printLink('zanode', 'createImage', "zanodeID={$node->id}", "<i class='icon icon-export'></i> ", '', "class='btn btn-action iframe createImage' title='{$lang->zanode->createImage}' data-width='55%'", '', true);
-                common::printLink('zanode', 'destroy', "zanodeID={$node->id}", "<i class='icon icon-trash'></i> ", '', "title='{$lang->zanode->destroy}' class='btn btn-action' target='hiddenwin'");
-                echo "</ul>";
-                echo "</div>";
+                if(common::hasPriv('zanode', 'createImage') or common::hasPriv('zanode', 'destroy'))
+                {
+                    echo "<div class='btn-group'>";
+                    echo "<button type='button' class='btn dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}'><i class='icon-ellipsis-v'></i></button>";
+                    echo "<ul class='dropdown-menu pull-right text-center' role='menu'>";
+                    common::printLink('zanode', 'createImage', "zanodeID={$node->id}", "<i class='icon icon-export'></i> ", '', "class='btn btn-action iframe createImage' title='{$lang->zanode->createImage}' data-width='55%'", '', true);
+                    common::printLink('zanode', 'destroy', "zanodeID={$node->id}", "<i class='icon icon-trash'></i> ", '', "title='{$lang->zanode->destroy}' class='btn btn-action' target='hiddenwin'");
+                    echo "</ul>";
+                    echo "</div>";
+                }
                 ?>
               </td>
             </tr>

module/zanode/view/view.html.php

@@ -28,7 +28,8 @@ $account = strpos($zanode->osName, "windows") ? $config->zanode->defaultWinAccou
 ?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <?php echo html::backButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, "data-app='{$app->tab}'", 'btn btn-secondary'); ?>
+    <?php $browseLink = inLink('browse');?>
+    <?php echo html::linkButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, $browseLink, 'self', "data-app='{$app->tab}'", 'btn btn-secondary');?>
     <div class='divider'></div>
     <div class='page-title'>
       <span class='label label-id'><?php echo $zanode->id; ?></span>
@@ -168,7 +169,7 @@ $account = strpos($zanode->osName, "windows") ? $config->zanode->defaultWinAccou
 
           if($zanode->status == "suspend")
           {
-              common::printLink('zanode', 'resume', "zanodeID={$zanode->id}", "<i class='icon icon-spinner-indicator'></i> " . $lang->zanode->resumeNode, '', $resumeAttr);
+              common::printLink('zanode', 'resume', "zanodeID={$zanode->id}", "<i class='icon icon-resume'></i> " . $lang->zanode->resumeNode, '', $resumeAttr);
           }
           else
           {