From c3e28ec6c1cca76029ea8797b69e9b5ed97baeb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Wed, 24 Jun 2015 16:21:35 +0200
Subject: [PATCH] Feature #3748: Use DS numeric states, translate state strings

---
 .../public/app/opennebula/datastore.js        | 30 ++++++++++++++-----
 .../app/tabs/datastores-tab/datatable.js      |  2 +-
 .../app/tabs/datastores-tab/panels/info.js    |  2 +-
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/sunstone/public/app/opennebula/datastore.js b/src/sunstone/public/app/opennebula/datastore.js
index fdb5a5b02c..f0599b3f67 100644
--- a/src/sunstone/public/app/opennebula/datastore.js
+++ b/src/sunstone/public/app/opennebula/datastore.js
@@ -1,23 +1,39 @@
 define(function(require) {
   var OpenNebulaAction = require('./action');
+  var Locale = require('utils/locale');
 
   var RESOURCE = "DATASTORE";
-  var STATES = ["ON", "OFF"];
+  var STATES_STR = [
+    Locale.tr("ON"),
+    Locale.tr("OFF")];
 
-  var TYPES = [
-    "IMAGE",
-    "SYSTEM",
-    "FILE"
+  var TYPES_STR = [
+    Locale.tr("IMAGE"),
+    Locale.tr("SYSTEM"),
+    Locale.tr("FILE")
   ];
 
+  var STATES = {
+    READY     : 0,
+    DISABLED  : 1
+  };
+
+  var TYPES = {
+    IMAGE_DS  : 0,
+    SYSTEM_DS : 1,
+    FILE_DS   : 2
+  };
+
   var Datastore = {
     "resource": RESOURCE,
     "stateStr": function(stateId) {
-      return STATES[stateId];
+      return STATES_STR[stateId];
     },
+    "STATES": STATES,
     "typeStr": function(typeId) {
-      return TYPES[typeId];
+      return TYPES_STR[typeId];
     },
+    "TYPES": TYPES,
     "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 133d1fd0b4..3a8ced2412 100644
--- a/src/sunstone/public/app/tabs/datastores-tab/datatable.js
+++ b/src/sunstone/public/app/tabs/datastores-tab/datatable.js
@@ -109,7 +109,7 @@ define(function(require) {
         element.TM_MAD,
         element.DS_MAD,
         OpenNebulaDatastore.typeStr(element.TYPE),
-        Locale.tr(OpenNebulaDatastore.stateStr(element.STATE))
+        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 33da26d8d1..1149944401 100644
--- a/src/sunstone/public/app/tabs/datastores-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/datastores-tab/panels/info.js
@@ -58,7 +58,7 @@ define(function(require) {
                                       Locale.tr("Attributes"));
     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 stateStr = OpenNebulaDatastore.stateStr(this.element.STATE);
     var typeStr = OpenNebulaDatastore.typeStr(this.element.TYPE);
 
     var limitStr = '-';