diff --git a/src/sunstone/public/app/opennebula/image.js b/src/sunstone/public/app/opennebula/image.js
index fe2c572bc0..430926f745 100644
--- a/src/sunstone/public/app/opennebula/image.js
+++ b/src/sunstone/public/app/opennebula/image.js
@@ -2,35 +2,58 @@ define(function(require) {
var OpenNebulaAction = require('./action');
var RESOURCE = "IMAGE";
- var STATES = [
- "INIT",
- "READY",
- "USED",
- "DISABLED",
- "LOCKED",
- "ERROR",
- "CLONE",
- "DELETE",
- "USED_PERS"
+ var STATES_STR = [
+ Locale.tr("INIT"),
+ Locale.tr("READY"),
+ Locale.tr("USED"),
+ Locale.tr("DISABLED"),
+ Locale.tr("LOCKED"),
+ Locale.tr("ERROR"),
+ Locale.tr("CLONE"),
+ Locale.tr("DELETE"),
+ Locale.tr("USED_PERS")
];
- var TYPES = [
- "OS",
- "CDROM",
- "DATABLOCK",
- "KERNEL",
- "RAMDISK",
- "CONTEXT"
+ var TYPES_STR = [
+ Locale.tr("OS"),
+ Locale.tr("CDROM"),
+ Locale.tr("DATABLOCK"),
+ Locale.tr("KERNEL"),
+ Locale.tr("RAMDISK"),
+ Locale.tr("CONTEXT")
];
+ var STATES = {
+ INIT : 0,
+ READY : 1,
+ USED : 2,
+ DISABLED : 3,
+ LOCKED : 4,
+ ERROR : 5,
+ CLONE : 6,
+ DELETE : 7,
+ USED_PERS : 8
+ };
+
+ var TYPES = {
+ OS : 0,
+ CDROM : 1,
+ DATABLOCK : 2,
+ KERNEL : 3,
+ RAMDISK : 4,
+ CONTEXT : 5
+ };
+
var Image = {
"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/files-tab/datatable.js b/src/sunstone/public/app/tabs/files-tab/datatable.js
index 66c6c2da2e..793d154cc3 100644
--- a/src/sunstone/public/app/tabs/files-tab/datatable.js
+++ b/src/sunstone/public/app/tabs/files-tab/datatable.js
@@ -87,8 +87,9 @@ define(function(require) {
function _elementArray(element_json) {
var element = element_json.IMAGE;
- // OS || CDROM || DATABLOCK
- if (element.TYPE == "0" || element.TYPE == "1" || element.TYPE == "2") {
+ if (element.TYPE == OpenNebulaImage.TYPES.OS ||
+ element.TYPE == OpenNebulaImage.TYPES.CDROM ||
+ element.TYPE == OpenNebulaImage.TYPES.DATABLOCK) {
return false;
}
diff --git a/src/sunstone/public/app/tabs/files-tab/panels/info.js b/src/sunstone/public/app/tabs/files-tab/panels/info.js
index 475b4de180..97ed20449e 100644
--- a/src/sunstone/public/app/tabs/files-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/files-tab/panels/info.js
@@ -58,7 +58,6 @@ define(function(require) {
var prettyRegTime = Humanize.prettyTime(this.element.REGTIME);
var fsTypeStr = this.element.FS_TYPE != undefined ? this.element.FS_TYPE : '-';
var sizeStr = Humanize.sizeFromMB(this.element.SIZE);
- var typeStr = Locale.tr(OpenNebulaImage.typeStr(this.element.TYPE));
return TemplateInfo({
'element': this.element,
@@ -68,7 +67,7 @@ define(function(require) {
'stateStr': stateStr,
'prettyRegTime': prettyRegTime,
'fsTypeStr': fsTypeStr,
- 'typeStr': typeStr,
+ 'typeStr': OpenNebulaImage.typeStr(this.element.TYPE),
'sizeStr': sizeStr
});
}
@@ -84,12 +83,25 @@ define(function(require) {
context.on("click", "#div_edit_chg_type_link", function() {
$(".value_td_type", context).html(
'');
- $('#chg_type_select', context).val(OpenNebulaImage.typeStr(that.element.TYPE));
+ var currentVal = "";
+ switch(parseInt(that.element.TYPE)){
+ case OpenNebulaImage.TYPES.KERNEL:
+ currentVal = "KERNEL";
+ break;
+ case OpenNebulaImage.TYPES.RAMDISK:
+ currentVal = "RAMDISK";
+ break;
+ case OpenNebulaImage.TYPES.CONTEXT:
+ currentVal = "CONTEXT";
+ break;
+ }
+
+ $('#chg_type_select', context).val(currentVal);
});
context.off("change", "#chg_type_select");
diff --git a/src/sunstone/public/app/tabs/images-tab/datatable.js b/src/sunstone/public/app/tabs/images-tab/datatable.js
index aa5ab48245..39445c2295 100644
--- a/src/sunstone/public/app/tabs/images-tab/datatable.js
+++ b/src/sunstone/public/app/tabs/images-tab/datatable.js
@@ -90,8 +90,9 @@ define(function(require) {
function _elementArray(element_json) {
var element = element_json.IMAGE;
- // KERNEL || RAMDISK || CONTEXT
- if (element.TYPE == "3" || element.TYPE == "4" || element.TYPE == "5") {
+ if (element.TYPE == OpenNebulaImage.TYPES.KERNEL ||
+ element.TYPE == OpenNebulaImage.TYPES.RAMDISK ||
+ element.TYPE == OpenNebulaImage.TYPES.CONTEXT) {
return false;
}
diff --git a/src/sunstone/public/app/tabs/images-tab/dialogs/clone.js b/src/sunstone/public/app/tabs/images-tab/dialogs/clone.js
index a72771a953..c42ca9b7d2 100644
--- a/src/sunstone/public/app/tabs/images-tab/dialogs/clone.js
+++ b/src/sunstone/public/app/tabs/images-tab/dialogs/clone.js
@@ -9,6 +9,7 @@ define(function(require) {
var DatastoreTable = require('tabs/datastores-tab/datatable')
var Notifier = require('utils/notifier');
var OpenNebulaImage = require('opennebula/image');
+ var OpenNebulaDatastore = require('opennebula/datastore');
/*
CONSTANTS
@@ -27,7 +28,9 @@ define(function(require) {
this.datastoreTable = new DatastoreTable('image_clone', {
'select': true,
'selectOptions': {
- 'filter_fn': function(ds) { return ds.TYPE == 0; }
+ 'filter_fn': function(ds) {
+ return ds.TYPE == OpenNebulaDatastore.TYPES.IMAGE_DS;
+ }
}
});
diff --git a/src/sunstone/public/app/tabs/images-tab/panels/info.js b/src/sunstone/public/app/tabs/images-tab/panels/info.js
index 877da6e9b4..b5320c68bc 100644
--- a/src/sunstone/public/app/tabs/images-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/images-tab/panels/info.js
@@ -53,24 +53,22 @@ define(function(require) {
var renameTrHTML = RenameTr.html(RESOURCE, this.element.NAME);
var templateTableHTML = TemplateTable.html(this.element.TEMPLATE, RESOURCE, Locale.tr("Attributes"));
var permissionsTableHTML = PermissionsTable.html(TAB_ID, RESOURCE, this.element);
- var stateStr = Locale.tr(OpenNebulaImage.stateStr(this.element.STATE));
var prettyRegTime = Humanize.prettyTime(this.element.REGTIME);
var fsTypeStr = this.element.FS_TYPE != undefined ? this.element.FS_TYPE : '-';
var sizeStr = Humanize.sizeFromMB(this.element.SIZE);
var persistentStr = parseInt(this.element.PERSISTENT) ? Locale.tr("yes") : Locale.tr("no");
- var typeStr = Locale.tr(OpenNebulaImage.typeStr(this.element.TYPE));
return TemplateInfo({
'element': this.element,
'renameTrHTML': renameTrHTML,
'templateTableHTML': templateTableHTML,
'permissionsTableHTML': permissionsTableHTML,
- 'stateStr': stateStr,
+ 'stateStr': OpenNebulaImage.stateStr(this.element.STATE),
'prettyRegTime': prettyRegTime,
'fsTypeStr': fsTypeStr,
'persistentActionEnabled': Config.isTabActionEnabled('images-tab', "Image.persistent"),
'persistentStr': persistentStr,
- 'typeStr': typeStr,
+ 'typeStr': OpenNebulaImage.typeStr(this.element.TYPE),
'sizeStr': sizeStr
});
}
@@ -86,12 +84,25 @@ define(function(require) {
context.on("click", "#div_edit_chg_type_link", function() {
$(".value_td_type", context).html(
'');
- $('#chg_type_select', context).val(OpenNebulaImage.typeStr(that.element.TYPE));
+ var currentVal = "";
+ switch(parseInt(that.element.TYPE)){
+ case OpenNebulaImage.TYPES.OS:
+ currentVal = "OS";
+ break;
+ case OpenNebulaImage.TYPES.CDROM:
+ currentVal = "CDROM";
+ break;
+ case OpenNebulaImage.TYPES.DATABLOCK:
+ currentVal = "DATABLOCK";
+ break;
+ }
+
+ $('#chg_type_select', context).val(currentVal);
});
context.off("change", "#chg_type_select");