mirror of
https://github.com/OpenNebula/one.git
synced 2025-03-21 14:50:08 +03:00
Bug #4711: Fix ID detection on callbacks
This commit is contained in:
parent
ccc8eb1686
commit
accf25dc3b
@ -36,7 +36,7 @@ define(function(require) {
|
||||
}
|
||||
}
|
||||
if (data) {
|
||||
if (typeof(data) != "array") {
|
||||
if (!(data instanceof Array)) {
|
||||
data = [data];
|
||||
}
|
||||
r.request.data = data;
|
||||
|
@ -74,7 +74,7 @@ define(function(require) {
|
||||
call : OpenNebulaResource.addhost,
|
||||
callback : function (req) {
|
||||
OpenNebulaAction.clear_cache("HOST");
|
||||
Sunstone.runAction('Cluster.show',req.request.data[0][0]);
|
||||
Sunstone.runAction('Cluster.show',req.request.data[0]);
|
||||
},
|
||||
error : Notifier.onError
|
||||
},
|
||||
@ -84,7 +84,7 @@ define(function(require) {
|
||||
call : OpenNebulaResource.delhost,
|
||||
callback : function (req) {
|
||||
OpenNebulaAction.clear_cache("HOST");
|
||||
Sunstone.runAction('Cluster.show',req.request.data[0][0]);
|
||||
Sunstone.runAction('Cluster.show',req.request.data[0]);
|
||||
},
|
||||
error : Notifier.onError
|
||||
},
|
||||
@ -94,7 +94,7 @@ define(function(require) {
|
||||
call : OpenNebulaResource.adddatastore,
|
||||
callback : function (req) {
|
||||
OpenNebulaAction.clear_cache("DATASTORE");
|
||||
Sunstone.runAction('Cluster.show',req.request.data[0][0]);
|
||||
Sunstone.runAction('Cluster.show',req.request.data[0]);
|
||||
},
|
||||
error : Notifier.onError
|
||||
},
|
||||
@ -104,7 +104,7 @@ define(function(require) {
|
||||
call : OpenNebulaResource.deldatastore,
|
||||
callback : function (req) {
|
||||
OpenNebulaAction.clear_cache("DATASTORE");
|
||||
Sunstone.runAction('Cluster.show',req.request.data[0][0]);
|
||||
Sunstone.runAction('Cluster.show',req.request.data[0]);
|
||||
},
|
||||
error : Notifier.onError
|
||||
},
|
||||
@ -114,7 +114,7 @@ define(function(require) {
|
||||
call : OpenNebulaResource.addvnet,
|
||||
callback : function (req) {
|
||||
OpenNebulaAction.clear_cache("VNET");
|
||||
Sunstone.runAction('Cluster.show',req.request.data[0][0]);
|
||||
Sunstone.runAction('Cluster.show',req.request.data[0]);
|
||||
},
|
||||
error : Notifier.onError
|
||||
},
|
||||
@ -124,7 +124,7 @@ define(function(require) {
|
||||
call : OpenNebulaResource.delvnet,
|
||||
callback : function (req) {
|
||||
OpenNebulaAction.clear_cache("VNET");
|
||||
Sunstone.runAction('Cluster.show',req.request.data[0][0]);
|
||||
Sunstone.runAction('Cluster.show',req.request.data[0]);
|
||||
},
|
||||
error : Notifier.onError
|
||||
}
|
||||
|
@ -87,7 +87,7 @@ define(function(require) {
|
||||
callback: function(request) {
|
||||
Sunstone.getDialog(QUOTAS_DIALOG_ID).hide();
|
||||
|
||||
Sunstone.runAction(RESOURCE+'.show',request.request.data[0][0]);
|
||||
Sunstone.runAction(RESOURCE+'.show',request.request.data[0]);
|
||||
},
|
||||
error: Notifier.onError
|
||||
},
|
||||
@ -96,7 +96,7 @@ define(function(require) {
|
||||
type: "single",
|
||||
call : OpenNebulaResource.add_admin,
|
||||
callback : function (req) {
|
||||
Sunstone.runAction(RESOURCE+'.show',req.request.data[0][0]);
|
||||
Sunstone.runAction(RESOURCE+'.show',req.request.data[0]);
|
||||
},
|
||||
error: Notifier.onError
|
||||
},
|
||||
@ -105,7 +105,7 @@ define(function(require) {
|
||||
type: "single",
|
||||
call : OpenNebulaResource.del_admin,
|
||||
callback : function (req) {
|
||||
Sunstone.runAction(RESOURCE+'.show',req.request.data[0][0]);
|
||||
Sunstone.runAction(RESOURCE+'.show',req.request.data[0]);
|
||||
},
|
||||
error: Notifier.onError
|
||||
}
|
||||
|
@ -502,7 +502,7 @@ define(function(require) {
|
||||
timeout: false,
|
||||
success: function(request, response){
|
||||
OpenNebula.Action.clear_cache("VMTEMPLATE");
|
||||
Notifier.notifyMessage(Locale.tr("VM Template") + ' ' + request.request.data[0][1].name + ' ' + Locale.tr("saved successfully"))
|
||||
Notifier.notifyMessage(Locale.tr("VM Template") + ' ' + request.request.data[1].name + ' ' + Locale.tr("saved successfully"))
|
||||
update_provision_vm_info(vm_id, context);
|
||||
button.removeAttr("disabled");
|
||||
},
|
||||
|
@ -80,7 +80,7 @@ define(function(require) {
|
||||
type: "multiple",
|
||||
call: OpenNebulaResource.delete_recursive,
|
||||
callback : function(request, response) {
|
||||
var elementId = request.request.data[0][0].toString();
|
||||
var elementId = request.request.data[0].toString();
|
||||
Sunstone.getDataTable(TAB_ID).deleteElement(elementId);
|
||||
},
|
||||
elements: function(opts) {
|
||||
@ -105,7 +105,7 @@ define(function(require) {
|
||||
Sunstone.runAction(RESOURCE+".chmod", params.data.id, permissions);
|
||||
},
|
||||
callback : function(request, response) {
|
||||
Sunstone.runAction(RESOURCE+".show", req.request.data[0][0]);
|
||||
Sunstone.runAction(RESOURCE+".show", req.request.data[0]);
|
||||
},
|
||||
elements: function(opts) {
|
||||
return Sunstone.getDataTable(TAB_ID).elements(opts);
|
||||
@ -126,7 +126,7 @@ define(function(require) {
|
||||
Sunstone.runAction(RESOURCE+".chmod", params.data.id, permissions);
|
||||
},
|
||||
callback : function(request, response) {
|
||||
Sunstone.runAction(RESOURCE+".show", req.request.data[0][0]);
|
||||
Sunstone.runAction(RESOURCE+".show", req.request.data[0]);
|
||||
},
|
||||
elements: function(opts) {
|
||||
return Sunstone.getDataTable(TAB_ID).elements(opts);
|
||||
|
@ -93,7 +93,7 @@ define(function(require) {
|
||||
type: "single",
|
||||
call: OpenNebulaResource.update,
|
||||
callback: function(request) {
|
||||
var reqId = request.request.data[0][0];
|
||||
var reqId = request.request.data[0];
|
||||
|
||||
Sunstone.runAction(RESOURCE+'.show',reqId);
|
||||
|
||||
@ -119,7 +119,7 @@ define(function(require) {
|
||||
type: "single",
|
||||
call: OpenNebulaResource.append,
|
||||
callback: function(request) {
|
||||
var reqId = request.request.data[0][0];
|
||||
var reqId = request.request.data[0];
|
||||
|
||||
Sunstone.runAction(RESOURCE+'.show',reqId);
|
||||
|
||||
@ -145,7 +145,7 @@ define(function(require) {
|
||||
type: "single",
|
||||
call: OpenNebulaResource.append,
|
||||
callback: function(request) {
|
||||
var reqId = request.request.data[0][0];
|
||||
var reqId = request.request.data[0];
|
||||
|
||||
if (reqId == config['user_id'] || reqId == "-1") {
|
||||
$.ajax({
|
||||
@ -251,7 +251,7 @@ define(function(require) {
|
||||
callback: function(request) {
|
||||
Sunstone.getDialog(QUOTAS_DIALOG_ID).hide();
|
||||
|
||||
Sunstone.runAction(RESOURCE+'.show',request.request.data[0][0]);
|
||||
Sunstone.runAction(RESOURCE+'.show',request.request.data[0]);
|
||||
},
|
||||
error: Notifier.onError
|
||||
}
|
||||
|
@ -71,7 +71,7 @@ define(function(require) {
|
||||
Sunstone.getDialog(ADD_AR_DIALOG_ID).hide();
|
||||
Sunstone.getDialog(ADD_AR_DIALOG_ID).reset();
|
||||
|
||||
Sunstone.runAction("Network.show",req.request.data[0][0]);
|
||||
Sunstone.runAction("Network.show",req.request.data[0]);
|
||||
},
|
||||
error: Notifier.onError
|
||||
},
|
||||
@ -81,7 +81,7 @@ define(function(require) {
|
||||
call: OpenNebulaResource.rm_ar,
|
||||
callback: function(req) {
|
||||
OpenNebulaAction.clear_cache("VNET");
|
||||
Sunstone.runAction("Network.show",req.request.data[0][0]);
|
||||
Sunstone.runAction("Network.show",req.request.data[0]);
|
||||
},
|
||||
error: Notifier.onError
|
||||
},
|
||||
@ -94,7 +94,7 @@ define(function(require) {
|
||||
Sunstone.getDialog(UPDATE_AR_DIALOG_ID).hide();
|
||||
Sunstone.getDialog(UPDATE_AR_DIALOG_ID).reset();
|
||||
|
||||
Sunstone.runAction("Network.show",req.request.data[0][0]);
|
||||
Sunstone.runAction("Network.show",req.request.data[0]);
|
||||
},
|
||||
error: Notifier.onError
|
||||
},
|
||||
@ -125,7 +125,7 @@ define(function(require) {
|
||||
Sunstone.getDialog(RESERVE_DIALOG_ID).reset();
|
||||
|
||||
OpenNebulaAction.clear_cache("VNET");
|
||||
Sunstone.runAction("Network.show",req.request.data[0][0]);
|
||||
Sunstone.runAction("Network.show",req.request.data[0]);
|
||||
},
|
||||
error: Notifier.onError
|
||||
},
|
||||
|
@ -115,7 +115,7 @@ define(function(require) {
|
||||
type: "multiple",
|
||||
call: that.openNebulaResource[actionStr],
|
||||
callback: function (req, response) {
|
||||
Sunstone.runAction(that.resourceStr + ".show", req.request.data[0][0]);
|
||||
Sunstone.runAction(that.resourceStr + ".show", req.request.data[0]);
|
||||
},
|
||||
elements: function(opts) {
|
||||
return Sunstone.getDataTable(that.tabId).elements(opts);
|
||||
@ -131,7 +131,7 @@ define(function(require) {
|
||||
type: "single",
|
||||
call: that.openNebulaResource[actionStr],
|
||||
callback: function (req) {
|
||||
Sunstone.runAction(that.resourceStr + ".show", req.request.data[0][0]);
|
||||
Sunstone.runAction(that.resourceStr + ".show", req.request.data[0]);
|
||||
},
|
||||
elements: function(opts) {
|
||||
return Sunstone.getDataTable(that.tabId).elements(opts);
|
||||
@ -245,7 +245,7 @@ define(function(require) {
|
||||
type: "single",
|
||||
call: that.openNebulaResource.update,
|
||||
callback: function(request) {
|
||||
Sunstone.runAction(that.resourceStr + '.show', request.request.data[0][0]);
|
||||
Sunstone.runAction(that.resourceStr + '.show', request.request.data[0]);
|
||||
},
|
||||
error: Notifier.onError
|
||||
}
|
||||
@ -257,7 +257,7 @@ define(function(require) {
|
||||
type: "single",
|
||||
call: that.openNebulaResource.append,
|
||||
callback: function(request) {
|
||||
Sunstone.runAction(that.resourceStr + '.show', request.request.data[0][0]);
|
||||
Sunstone.runAction(that.resourceStr + '.show', request.request.data[0]);
|
||||
},
|
||||
error: Notifier.onError
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user