shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-20 10:50:08 +03:00
Code Releases Wiki Activity

Feature #3748: Remove getName from tab-datatable

Browse Source
This commit is contained in:
Carlos Martín 2015-06-18 13:34:24 +02:00
parent ff395e113d
commit 9bf88c1a9b
7 changed files with 20 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/sunstone/public/app/tabs/acls-tab/datatable.js
View File

@ -6,7 +6,10 @@ define(function(require) {
var TabDataTable = require('utils/tab-datatable');
var SunstoneConfig = require('sunstone-config');
var Locale = require('utils/locale');
var Sunstone = require('sunstone');
var OpenNebulaUser = require('opennebula/user');
var OpenNebulaGroup = require('opennebula/group');
var OpenNebulaZone = require('opennebula/zone');
/*
CONSTANTS
@ -16,10 +19,6 @@ define(function(require) {
var XML_ROOT = "ACL";
var TAB_NAME = require('./tabId');
var USER_TAB_ID = require('tabs/users-tab/tabId');
var GROUP_TAB_ID = require('tabs/groups-tab/tabId');
var ZONE_TAB_ID = require('tabs/zones-tab/tabId');
/*
CONSTRUCTOR
*/
@ -188,11 +187,11 @@ define(function(require) {
} else {
if (user[0] == '#'){
user_str=Locale.tr("User")+" ";
user_str+= Sunstone.getDataTable(USER_TAB_ID).getName(user.substring(1));
user_str+= OpenNebulaUser.getName(user.substring(1));
}
else if (user[0] == '@'){
user_str=Locale.tr("Group ");
user_str+= Sunstone.getDataTable(GROUP_TAB_ID).getName(user.substring(1));
user_str+= OpenNebulaGroup.getName(user.substring(1));
}
}
return user_str;
@ -210,7 +209,7 @@ define(function(require) {
}
else if (user[0] == '@'){
user_str=Locale.tr("Group")+" ";
user_str+= Sunstone.getDataTable(GROUP_TAB_ID).getName(user.substring(1));
user_str+= OpenNebulaGroup.getName(user.substring(1));
}
else if (user[0] == '%'){
user_str=Locale.tr("Cluster ID")+" ";
@ -231,7 +230,7 @@ define(function(require) {
if (zone[0] == '*'){
zone_str = Locale.tr("All");
} else if (zone[0] == '#'){
zone_str = Sunstone.getDataTable(ZONE_TAB_ID).getName(zone.substring(1));
zone_str = OpenNebulaZone.getName(zone.substring(1));
}
return zone_str;

5
src/sunstone/public/app/tabs/images-tab/dialogs/clone.js
View File

@ -8,6 +8,7 @@ define(function(require) {
var Sunstone = require('sunstone');
var DatastoreTable = require('tabs/datastores-tab/datatable')
var Notifier = require('utils/notifier');
var OpenNebulaImage = require('opennebula/image');
/*
CONSTANTS
@ -81,7 +82,7 @@ define(function(require) {
for (var i = 0; i < sel_elems.length; i++) {
//If we are cloning several images we
//use the name as prefix
extra_info['name'] = name + Sunstone.getDataTable(IMAGES_TAB_ID).getName(sel_elems[i]);
extra_info['name'] = name + OpenNebulaImage.getName(sel_elems[i]);
Sunstone.runAction('Image.clone', sel_elems[i], extra_info);
}
} else {
@ -110,7 +111,7 @@ define(function(require) {
} else {
$('.clone_one', dialog).show();
$('.clone_several', dialog).hide();
$('input[name="image_clone_name"]', dialog).val('Copy of ' + Sunstone.getDataTable(IMAGES_TAB_ID).getName(sel_elems[0]));
$('input[name="image_clone_name"]', dialog).val('Copy of ' + OpenNebulaImage.getName(sel_elems[0]));
};
$('#image_clone_advanced', dialog).hide();

5
src/sunstone/public/app/tabs/secgroups-tab/dialogs/clone.js
View File

@ -8,6 +8,7 @@ define(function(require) {
var Sunstone = require('sunstone');
var Notifier = require('utils/notifier');
var Locale = require('utils/locale');
var OpenNebulaSecurityGroup = require('opennebula/securitygroup');
/*
CONSTANTS
@ -68,7 +69,7 @@ define(function(require) {
//use name as prefix if several items selected
Sunstone.runAction('SecurityGroup.clone',
sel_elems[i],
name + Sunstone.getDataTable(TAB_ID).getName(sel_elems[i]));
name + OpenNebulaSecurityGroup.getName(sel_elems[i]));
} else {
Sunstone.runAction('SecurityGroup.clone',sel_elems[0],name);
}
@ -93,7 +94,7 @@ define(function(require) {
$('.clone_one', context).show();
$('.clone_several', context).hide();
$('input',context).val('Copy of ' + Sunstone.getDataTable(TAB_ID).getName(sel_elems[0]));
$('input',context).val('Copy of ' + OpenNebulaSecurityGroup.getName(sel_elems[0]));
}
$("input[name='name']",context).focus();

7
src/sunstone/public/app/tabs/settings-tab/panels/group-quotas.js
View File

@ -8,7 +8,6 @@ define(function(require) {
var QuotaDefaults = require('utils/quotas/quota-defaults');
var QuotaWidgets = require('utils/quotas/quota-widgets');
var OpenNebulaGroup = require('opennebula/group');
var Sunstone = require('sunstone');
/*
CONSTANTS
@ -19,8 +18,6 @@ define(function(require) {
var RESOURCE = "User";
var XML_ROOT = "USER";
var GROUP_TAB_ID = require('tabs/groups-tab/tabId');
/*
CONSTRUCTOR
*/
@ -71,11 +68,9 @@ define(function(require) {
groupDropdownOptions +=
'<option elem_id="'+this+
'" value="'+this+'">'+
Sunstone.getDataTable(GROUP_TAB_ID).getName(this)+' (id:'+this+')</option>';
OpenNebulaGroup.getName(this)+' (id:'+this+')</option>';
});
// TODO bug Sunstone.getDataTable(GROUP_TAB_ID) fails for user.yaml, groups-tab does not exist
$('select#quota_group_sel', context).html(groupDropdownOptions);
$("#quota_group_sel", context).off("change");

5
src/sunstone/public/app/tabs/templates-tab/dialogs/clone.js
View File

@ -7,6 +7,7 @@ define(function(require) {
var TemplateHTML = require('hbs!./clone/html');
var Sunstone = require('sunstone');
var Notifier = require('utils/notifier');
var OpenNebulaTemplate = require('opennebula/template');
/*
CONSTANTS
@ -59,7 +60,7 @@ define(function(require) {
for (var i = 0; i < sel_elems.length; i++) {
//If we are cloning several images we
//use the name as prefix
extra_info = name + Sunstone.getDataTable(TEMPLATES_TAB_ID).getName(sel_elems[i]);
extra_info = name + OpenNebulaTemplate.getName(sel_elems[i]);
Sunstone.runAction('Template.clone', sel_elems[i], extra_info);
}
} else {
@ -88,7 +89,7 @@ define(function(require) {
} else {
$('.clone_one', context).show();
$('.clone_several', context).hide();
$('input[name="name"]', context).val('Copy of ' + Sunstone.getDataTable(TEMPLATES_TAB_ID).getName(sel_elems[0]));
$('input[name="name"]', context).val('Copy of ' + OpenNebulaTemplate.getName(sel_elems[0]));
};
$("input[name='name']", context).focus();

6
src/sunstone/public/app/tabs/vdcs-tab/panels/resources.js
View File

@ -6,6 +6,7 @@ define(function(require) {
var Locale = require('utils/locale');
var Utils = require('../utils/common');
var ResourcesTab = require('../utils/resources-tab');
var OpenNebulaZone = require('opennebula/zone');
/*
CONSTANTS
@ -16,9 +17,6 @@ define(function(require) {
var RESOURCE = "Vdc";
var XML_ROOT = "VDC";
var ZONE_TAB_ID = require('tabs/zones-tab/tabId');
var Sunstone = require('sunstone');
/*
CONSTRUCTOR
*/
@ -56,7 +54,7 @@ define(function(require) {
$.each(indexed_resources, function(zone_id,objects){
that.resourcesTab.addResourcesZone(
zone_id,
Sunstone.getDataTable(ZONE_TAB_ID).getName(zone_id),
OpenNebulaZone.getName(zone_id),
context,
indexed_resources);
});

22
src/sunstone/public/app/utils/tab-datatable.js
View File

@ -136,7 +136,6 @@ define(function(require) {
'idInput': _idInput,
'initSelectResourceTableSelect': _initSelectResourceTableSelect,
'updateFn': _updateFn,
'getName': _getName,
'list': _list
}
@ -959,27 +958,6 @@ define(function(require) {
});
}
}
// Returns the value of the column with the resource of specified
// id in the dataTable.
// TODO do not use datatable to retrieve the names use Resource.show or cache instead
function _getName(resourceId) {
var that = this;
var name = resourceId;
if (typeof(that.dataTable) == "undefined") {
return name;
}
var nodes = that.dataTable.fnGetData();
$.each(nodes, function() {
if (resourceId == this[that.selectOptions.id_index]) {
name = this[that.selectOptions.name_index];
return false;
}
});
return name;
};
// Used by panels that contain tables from other resources.
// TODO: This is probably duplicated somewhere
function _list() {