From e5d80b6799e9482becdd2cf51328738490e54ed7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Tue, 23 Jun 2015 11:54:23 +0200
Subject: [PATCH] Feature #3748: Use numeric DS type, instead of the template
 string attribute

---
 src/sunstone/public/app/opennebula/datastore.js          | 9 +++++++++
 src/sunstone/public/app/tabs/datastores-tab/datatable.js | 9 +--------
 .../public/app/tabs/datastores-tab/panels/info.js        | 2 ++
 .../public/app/tabs/datastores-tab/panels/info/html.hbs  | 5 +++++
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/sunstone/public/app/opennebula/datastore.js b/src/sunstone/public/app/opennebula/datastore.js
index 44bee59875..fdb5a5b02c 100644
--- a/src/sunstone/public/app/opennebula/datastore.js
+++ b/src/sunstone/public/app/opennebula/datastore.js
@@ -4,11 +4,20 @@ define(function(require) {
   var RESOURCE = "DATASTORE";
   var STATES = ["ON", "OFF"];
 
+  var TYPES = [
+    "IMAGE",
+    "SYSTEM",
+    "FILE"
+  ];
+
   var Datastore = {
     "resource": RESOURCE,
     "stateStr": function(stateId) {
       return STATES[stateId];
     },
+    "typeStr": function(typeId) {
+      return TYPES[typeId];
+    },
     "create" : function(params) {
       OpenNebulaAction.create(params, RESOURCE);
     },
diff --git a/src/sunstone/public/app/tabs/datastores-tab/datatable.js b/src/sunstone/public/app/tabs/datastores-tab/datatable.js
index f7b20df2dc..133d1fd0b4 100644
--- a/src/sunstone/public/app/tabs/datastores-tab/datatable.js
+++ b/src/sunstone/public/app/tabs/datastores-tab/datatable.js
@@ -95,13 +95,6 @@ define(function(require) {
   function _elementArray(element_json) {
     var element = element_json.DATASTORE;
 
-    var ds_type_str = "IMAGE_DS";
-
-    if (typeof element.TEMPLATE.TYPE != "undefined")
-    {
-      ds_type_str = element.TEMPLATE.TYPE;
-    }
-
     return [
         '<input class="check_item" type="checkbox" id="'+RESOURCE.toLowerCase()+'_' +
                              element.ID + '" name="selected_items" value="' +
@@ -115,7 +108,7 @@ define(function(require) {
         element.BASE_PATH,
         element.TM_MAD,
         element.DS_MAD,
-        ds_type_str.toLowerCase().split('_')[0],
+        OpenNebulaDatastore.typeStr(element.TYPE),
         Locale.tr(OpenNebulaDatastore.stateStr(element.STATE))
     ];
   }
diff --git a/src/sunstone/public/app/tabs/datastores-tab/panels/info.js b/src/sunstone/public/app/tabs/datastores-tab/panels/info.js
index eae818d26a..33da26d8d1 100644
--- a/src/sunstone/public/app/tabs/datastores-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/datastores-tab/panels/info.js
@@ -59,6 +59,7 @@ define(function(require) {
     var permissionsTableHTML = PermissionsTable.html(TAB_ID, RESOURCE, this.element);
     var capacityBar = DatastoreCapacityBar.html(this.element);
     var stateStr = Locale.tr(OpenNebulaDatastore.stateStr(this.element.STATE));
+    var typeStr = OpenNebulaDatastore.typeStr(this.element.TYPE);
 
     var limitStr = '-';
     if (this.element.TEMPLATE.SHARED == "NO" || this.element.TEMPLATE.LIMIT_MB != undefined) {
@@ -73,6 +74,7 @@ define(function(require) {
       'permissionsTableHTML': permissionsTableHTML,
       'capacityBar': capacityBar,
       'stateStr': stateStr,
+      'typeStr': typeStr,
       'limitStr': limitStr
     });
   }
diff --git a/src/sunstone/public/app/tabs/datastores-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/datastores-tab/panels/info/html.hbs
index cd8f778955..6a57d8ad26 100644
--- a/src/sunstone/public/app/tabs/datastores-tab/panels/info/html.hbs
+++ b/src/sunstone/public/app/tabs/datastores-tab/panels/info/html.hbs
@@ -18,6 +18,11 @@
           <td class="value_td">{{stateStr}}</td>
           <td></td>
         </tr>
+        <tr>
+          <td class="key_td">{{tr "Type"}}</td>
+          <td class="value_td">{{typeStr}}</td>
+          <td></td>
+        </tr>
         <tr>
           <td class="key_td">{{tr "Base path"}}</td>
           <td class="value_td">{{element.BASE_PATH}}</td>