mirror of
https://github.com/OpenNebula/one.git
synced 2025-03-16 22:50:10 +03:00
Feature #3748: Use numeric DS type, instead of the template string attribute
This commit is contained in:
parent
5fc292560a
commit
e5d80b6799
@ -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);
|
||||
},
|
||||
|
@ -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))
|
||||
];
|
||||
}
|
||||
|
@ -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
|
||||
});
|
||||
}
|
||||
|
@ -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>
|
||||
|
Loading…
x
Reference in New Issue
Block a user