Feature #3748: Use image numeric states, translate state strings

This commit is contained in:
Carlos Martín committed 2015-06-24 16:35:42 +02:00
1 parent c3e28ec6c1
commit 3e4ccb068f
6 files changed
+89 -38

No files matched your search

+42 -19
View File
@@ -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);
},
@@ -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;
}
@@ -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(
'<select id="chg_type_select">\
<option value="KERNEL">KERNEL</option>\
<option value="RAMDISK">RAMDISK</option>\
<option value="CONTEXT">CONTEXT</option>\
<option value="KERNEL">'+Locale.tr("KERNEL")+'</option>\
<option value="RAMDISK">'+Locale.tr("RAMDISK")+'</option>\
<option value="CONTEXT">'+Locale.tr("CONTEXT")+'</option>\
</select>');
$('#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");
@@ -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;
}
@@ -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;
}
}
});
@@ -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(
'<select id="chg_type_select">\
<option value="OS">OS</option>\
<option value="CDROM">CDROM</option>\
<option value="DATABLOCK">DATABLOCK</option>\
<option value="OS">'+Locale.tr("OS")+'</option>\
<option value="CDROM">'+Locale.tr("CDROM")+'</option>\
<option value="DATABLOCK">'+Locale.tr("DATABLOCK")+'</option>\
</select>');
$('#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");