From 447bc1849d74065bd2751ce30f106277ac82117b Mon Sep 17 00:00:00 2001
From: Hector Sanjuan <hsanjuan@opennebula.org>
Date: Mon, 26 Mar 2012 12:06:00 +0200
Subject: [PATCH] Sunstone: minor bugfixes. Show host tab for regular users.

---
 src/sunstone/etc/sunstone-plugins.yaml         |  3 +--
 src/sunstone/public/js/plugins/clusters-tab.js |  2 +-
 .../public/js/plugins/datastores-tab.js        |  8 +++++---
 src/sunstone/public/js/plugins/hosts-tab.js    | 18 ++++++++++++------
 src/sunstone/public/js/plugins/vnets-tab.js    |  2 +-
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/sunstone/etc/sunstone-plugins.yaml b/src/sunstone/etc/sunstone-plugins.yaml
index bc724898ba..7330791c4e 100644
--- a/src/sunstone/etc/sunstone-plugins.yaml
+++ b/src/sunstone/etc/sunstone-plugins.yaml
@@ -54,10 +54,9 @@
     :user:
     :group:
 - plugins/hosts-tab.js:
-    :ALL: false
+    :ALL: true
     :user:
     :group:
-        oneadmin: true
 - plugins/datastores-tab.js:
     :ALL: true
     :user:
diff --git a/src/sunstone/public/js/plugins/clusters-tab.js b/src/sunstone/public/js/plugins/clusters-tab.js
index b0cccd6aaa..3de0de0bfe 100644
--- a/src/sunstone/public/js/plugins/clusters-tab.js
+++ b/src/sunstone/public/js/plugins/clusters-tab.js
@@ -453,7 +453,7 @@ function removeClusterMenus(){
 //    Sunstone.removeMainTab('cluster_vnets_tab_n',true);
 //    Sunstone.removeMainTab('cluster_datastores_tab_n',true);
 //    Sunstone.removeMainTab('cluster_hosts_tab_n',true);
-    Sunstone.removeMainTab('cluster_tab_n',true);
+    Sunstone.removeMainTab('cluster_tab_-',true);
 
     for (var i=0; i < data.length; i++){
         var id = data[i][1];
diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js
index 854bbba145..d7470dd7d8 100644
--- a/src/sunstone/public/js/plugins/datastores-tab.js
+++ b/src/sunstone/public/js/plugins/datastores-tab.js
@@ -271,7 +271,8 @@ var datastore_buttons = {
     "Datastore.update_dialog" : {
         type: "action",
         text: tr("Update properties"),
-        alwaysActive: true
+        alwaysActive: true,
+        condition: mustBeAdmin,
     },
     "Datastore.addtocluster" : {
         type: "confirm_with_select",
@@ -296,7 +297,8 @@ var datastore_buttons = {
     },
     "Datastore.delete" : {
         type: "confirm",
-        text: tr("Delete")
+        text: tr("Delete"),
+        condition: mustBeAdmin
     }
 }
 
@@ -443,7 +445,7 @@ function updateDatastoreInfo(request,ds){
               </tr>\
               <tr>\
                  <td class="key_td">'+tr("Cluster")+'</td>\
-                 <td class="value_td">'+(element.CLUSTER.length ? element.CLUSTER : "-")+'</td>\
+                 <td class="value_td">'+(info.CLUSTER.length ? info.CLUSTER : "-")+'</td>\
               </tr>\
               <tr>\
                  <td class="key_td">'+tr("DS Mad")+'</td>\
diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js
index 0abc980a5b..147e793ef5 100644
--- a/src/sunstone/public/js/plugins/hosts-tab.js
+++ b/src/sunstone/public/js/plugins/hosts-tab.js
@@ -271,30 +271,36 @@ var host_buttons = {
         },
     "Host.create_dialog" : {
         type: "create_dialog",
-        text: tr("+ New")
+        text: tr("+ New"),
+        condition: mustBeAdmin
     },
     "Host.update_dialog" : {
         type: "action",
         text: tr("Update a template"),
-        alwaysActive: true
+        alwaysActive: true,
+        condition: mustBeAdmin
     },
     "Host.addtocluster" : {
         type: "confirm_with_select",
         text: tr("Select cluster"),
         select: clusters_sel,
         tip: tr("Select the destination cluster:"),
+        condition: mustBeAdmin
     },
     "Host.enable" : {
         type: "action",
-        text: tr("Enable")
+        text: tr("Enable"),
+        condition: mustBeAdmin
     },
     "Host.disable" : {
         type: "action",
-        text: tr("Disable")
+        text: tr("Disable"),
+        condition: mustBeAdmin
     },
     "Host.delete" : {
         type: "confirm",
-        text: tr("Delete host")
+        text: tr("Delete host"),
+        condition: mustBeAdmin
     }
 };
 
@@ -475,7 +481,7 @@ function updateHostInfo(request,host){
             </tr>\
             <tr>\
                 <td class="key_td">' + tr("Cluster") + '</td>\
-                <td class="value_td">'+(host.CLUSTER.length ? host.CLUSTER : "-")+'</td>\
+                <td class="value_td">'+(host_info.CLUSTER.length ? host_info.CLUSTER : "-")+'</td>\
             </tr>\
             <tr>\
                 <td class="key_td">' + tr("State") + '</td>\
diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js
index d65f672ebe..8f9a2d1b5d 100644
--- a/src/sunstone/public/js/plugins/vnets-tab.js
+++ b/src/sunstone/public/js/plugins/vnets-tab.js
@@ -566,7 +566,7 @@ function updateVNetworkInfo(request,vn){
             </tr>\
             <tr>\
               <td class="key_td">'+tr("Cluster")+'</td>\
-              <td class="value_td">'+(network.CLUSTER.length ? network.CLUSTER : "-")+'</td>\
+              <td class="value_td">'+(vn_info.CLUSTER.length ? vn_info.CLUSTER : "-")+'</td>\
             </tr>\
             <tr>\
               <td class="key_td">'+tr("Owner")+'</td>\