1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00

Feature #4211: Fix minor bugs

This commit fixes:
- when vm template instantiates more than one VM, the back button is clicked once for each VM.
- when a resource is deleted the back button is not clicked
- vnet update form does not open
This commit is contained in:
Carlos Martín 2016-08-25 18:06:33 +02:00
parent 19a7a76062
commit a69d305d73
5 changed files with 14 additions and 21 deletions

View File

@ -1031,7 +1031,10 @@ define(function(require) {
}
var context = $("#" + tabId);
$('[href="back"]', context).trigger("click");
if (_formPanelVisible(context)){
$('[href="back"]', context).trigger("click");
}
}
function _popFormPanelLoading(tabId) {

View File

@ -80,8 +80,9 @@ define(function(require) {
type: "multiple",
call: OpenNebulaResource.delete_recursive,
callback : function(request, response) {
var elementId = request.request.data[0].toString();
Sunstone.getDataTable(TAB_ID).deleteElement(elementId);
if (Sunstone.getTab() == TAB_ID) {
Sunstone.showTab(TAB_ID);
}
},
elements: function(opts) {
return Sunstone.getDataTable(TAB_ID).elements(opts);

View File

@ -324,7 +324,7 @@ define(function(require) {
this.setHeader(element);
this.resourceId = element.ID;
$("#default_sg_warning").hide();
$("#default_sg_warning", context).hide();
// Populates the Avanced mode Tab
$('#template', context).val(TemplateUtils.templateToString(element.TEMPLATE));
@ -380,7 +380,7 @@ define(function(require) {
CustomTagsTable.fill($("#vnetCreateContextTab", context), element.TEMPLATE);
// Remove the first AR added in initialize_
$("#vnetCreateARTab i.remove-tab", context).trigger("click");
$("#vnetCreateARTab ul#vnet_wizard_ar_tabs i.remove-tab", context).trigger("click");
$("#vnetCreateARTab #vnetCreateARTabUpdate", context).show();
$("#vnetCreateARTab #vnetCreateARTabCreate", context).hide();
}

View File

@ -98,8 +98,11 @@ define(function(require) {
type: "multiple",
call : that.openNebulaResource.del,
callback : function(request, response) {
var elementId = request.request.data.toString();
Sunstone.getDataTable(that.tabId).deleteElement(elementId);
var tab = $('#' + that.tabId);
if (Sunstone.getTab() == that.tabId) {
Sunstone.showTab(that.tabId);
}
},
elements: function(opts) {
return Sunstone.getDataTable(that.tabId).elements(opts);

View File

@ -160,7 +160,6 @@ define(function(require) {
'tableCheckboxesListener': _tableCheckboxesListener,
'onlyOneCheckboxListener': _onlyOneCheckboxListener,
'infoListener': _infoListener,
'deleteElement': _deleteElement,
'updateElement': _updateElement,
'elements': _elements,
'updateView': _updateView,
@ -436,19 +435,6 @@ define(function(require) {
});
}
//deletes an element with id 'elementId' from a dataTable
function _deleteElement(elementId) {
var tag = '#' + this.resource.toLowerCase() + '_' + elementId;
var tr = $(tag, this.dataTable).parents('tr')[0];
this.dataTable.fnDeleteRow(tr);
this.recountCheckboxes();
var tab = this.dataTable.parents(".tab");
if (Sunstone.rightInfoVisible(tab)) {
$("a[href='back']", tab).click();
}
}
//Add a listener to the check-all box of a datatable, enabling it to
//check and uncheck all the checkboxes of its elements.
function _initCheckAllBoxes() {