X-Git-Url: http://git.onelab.eu/?p=plstackapi.git;a=blobdiff_plain;f=planetstack%2Fcore%2Fxoslib%2Fstatic%2Fjs%2Fxoslib%2Fxos-backbone.js;h=6a7b9d97165eeadb64ab6a6e129d36de0b6ff4e0;hp=3d2d7f7574013b448fd9b8311570d5e16e1fef56;hb=ff96374247bc69d246eee900e50a571b66e307bf;hpb=ef9db61058e6c5891721e997614c6c76905c230a diff --git a/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js b/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js index 3d2d7f7..6a7b9d9 100644 --- a/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js +++ b/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js @@ -472,11 +472,11 @@ if (! window.XOSLIB_LOADED ) { define_model(this, {urlRoot: SLIVER_API, relatedCollections: {"networkSlivers": "sliver"}, foreignCollections: ["slices", "deployments", "images", "nodes", "users", "flavors"], - foreignFields: {"creator": "users", "image": "images", "node": "nodes", "deploymentNetwork": "deployments", "slice": "slices", "flavor": "flavors"}, + foreignFields: {"creator": "users", "image": "images", "node": "nodes", "deployment": "deployments", "slice": "slices", "flavor": "flavors"}, modelName: "sliver", - listFields: ["backend_status", "id", "name", "instance_id", "instance_name", "slice", "deploymentNetwork", "image", "node", "flavor"], - addFields: ["slice", "deploymentNetwork", "flavor", "image", "node"], - detailFields: ["backend_status", "name", "instance_id", "instance_name", "slice", "deploymentNetwork", "flavor", "image", "node", "creator"], + listFields: ["backend_status", "id", "name", "instance_id", "instance_name", "slice", "deployment", "image", "node", "flavor"], + addFields: ["slice", "deployment", "flavor", "image", "node"], + detailFields: ["backend_status", "name", "instance_id", "instance_name", "slice", "deployment", "flavor", "image", "node", "creator"], preSave: function() { if (!this.attributes.name && this.attributes.slice) { this.attributes.name = xos.idToName(this.attributes.slice, "slices", "name"); } }, }); @@ -552,7 +552,7 @@ if (! window.XOSLIB_LOADED ) { }); define_model(this, { urlRoot: DEPLOYMENT_API, - relatedCollections: {"nodes": "deployment", "slivers": "deploymentNetwork"}, + relatedCollections: {"nodes": "deployment", "slivers": "deployment"}, m2mFields: {"flavors": "flavors", "sites": "sites", "images": "images"}, modelName: "deployment", listFields: ["backend_status", "id", "name", "backend_type", "admin_tenant"],