From 13d0dcef184ccfd3b8a9d968a1349d71b690f0e7 Mon Sep 17 00:00:00 2001 From: Scott Baker Date: Fri, 7 Nov 2014 16:35:30 -0800 Subject: [PATCH] modelName field added to XOSCollections --- .../xoslib/static/js/xoslib/xos-backbone.js | 51 ++++++++++++------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js b/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js index 15629b7..555d827 100644 --- a/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js +++ b/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js @@ -192,101 +192,118 @@ if (! window.XOSLIB_LOADED ) { this.sliverCollection = XOSCollection.extend({ urlRoot: SLIVER_API, relatedCollections: {"networkSlivers": "sliver"}, foreignCollections: ["slices", "deployments", "images", "nodes", "users"], - model: this.sliver}); + model: this.sliver, + modelName: "sliver"}); this.slivers = new this.sliverCollection(); this.slice = XOSModel.extend({ urlRoot: SLICE_API, modelName: "slice" }); this.sliceCollection = XOSCollection.extend({ urlRoot: SLICE_API, relatedCollections: {"slivers": "slice", "sliceDeployments": "slice", "slicePrivileges": "slice", "networks": "owner"}, foreignCollections: ["services", "sites"], - model: this.slice}); + model: this.slice, + modelName: "slice"}); this.slices = new this.sliceCollection(); this.sliceDeployment = XOSModel.extend({ urlRoot: SLICEDEPLOYMENT_API, modelName: "sliceDeployment" }); this.sliceDeploymentCollection = XOSCollection.extend({ urlRoot: SLICEDEPLOYMENT_API, foreignCollections: ["slices", "deployments"], - model: this.slice}); + model: this.sliceDeployment, + modelName: "sliceDeployment"}); this.sliceDeployments = new this.sliceDeploymentCollection(); this.slicePrivilege = XOSModel.extend({ urlRoot: SLICEPRIVILEGE_API, modelName: "slicePrivilege" }); this.slicePrivilegeCollection = XOSCollection.extend({ urlRoot: SLICEPRIVILEGE_API, foreignCollections: ["slices", "users", "sliceRoles"], - model: this.slice}); + model: this.slicePrivilege, + modelName: "slicePrivilege"}); this.slicePrivileges = new this.slicePrivilegeCollection(); this.sliceRole = XOSModel.extend({ urlRoot: SLICEROLE_API, modelName: "sliceRole" }); this.sliceRoleCollection = XOSCollection.extend({ urlRoot: SLICEROLE_API, - model: this.slice}); + model: this.sliceRole, + modelName: "sliceRole"}); this.sliceRoles = new this.sliceRoleCollection(); this.node = XOSModel.extend({ urlRoot: NODE_API, modelName: "node" }); this.nodeCollection = XOSCollection.extend({ urlRoot: NODE_API, foreignCollections: ["sites", "deployments"], - model: this.node}); + model: this.node, + modelName: "node"}); this.nodes = new this.nodeCollection(); this.site = XOSModel.extend({ urlRoot: SITE_API, modelName: "site" }); this.siteCollection = XOSCollection.extend({ urlRoot: SITE_API, relatedCollections: {"users": "site", "slices": "site", "nodes": "site"}, - model: this.site}); + model: this.site, + modelName: "site"}); this.sites = new this.siteCollection(); this.user = XOSModel.extend({ urlRoot: USER_API, modelName: "user" }); this.userCollection = XOSCollection.extend({ urlRoot: USER_API, relatedCollections: {"slicePrivileges": "user", "slices": "owner", "userDeployments": "user"}, foreignCollections: ["sites"], - model: this.user}); + model: this.user, + modelName: "user"}); this.users = new this.userCollection(); this.userDeployment = XOSModel.extend({ urlRoot: USERDEPLOYMENT_API, modelName: "userDeployment" }); this.userDeploymentCollection = XOSCollection.extend({ urlRoot: USERDEPLOYMENT_API, foreignCollections: ["users","deployments"], - model: this.user}); + model: this.userDeployment, + modelName: "userDeployment"}); this.userDeployments = new this.userDeploymentCollection(); this.deployment = XOSModel.extend({ urlRoot: DEPLOYMENT_API, modelName: "deployment" }); this.deploymentCollection = XOSCollection.extend({ urlRoot: DEPLOYMENT_API, relatedCollections: {"nodes": "deployment", "slivers": "deploymentNetwork", "networkDeployments": "deployment", "userDeployments": "deployment"}, - model: this.deployment}); + model: this.deployment, + modelName: "deployment"}); this.deployments = new this.deploymentCollection(); this.image = XOSModel.extend({ urlRoot: IMAGE_API, modelName: "image" }); this.imageCollection = XOSCollection.extend({ urlRoot: IMAGE_API, - model: this.image}); + model: this.image, + modelName: "image"}); this.images = new this.imageCollection(); this.networkTemplate = XOSModel.extend({ urlRoot: NETWORKTEMPLATE_API, modelName: "networkTemplate" }); this.networkTemplateCollection = XOSCollection.extend({ urlRoot: NETWORKTEMPLATE_API, - model: this.networkTemplate}); + model: this.networkTemplate, + modelName: "networkTemplate"}); this.networkTemplates = new this.networkTemplateCollection(); this.network = XOSModel.extend({ urlRoot: NETWORK_API, modelName: "network" }); this.networkCollection = XOSCollection.extend({ urlRoot: NETWORK_API, relatedCollections: {"networkDeployments": "network", "networkSlivers": "network"}, foreignCollections: ["slices", "networkTemplates"], - model: this.network}); + model: this.network, + modelName: "network"}); this.networks = new this.networkCollection(); this.networkSliver = XOSModel.extend({ urlRoot: NETWORKSLIVER_API, modelName: "networkSliver" }); this.networkSliverCollection = XOSCollection.extend({ urlRoot: NETWORKSLIVER_API, - model: this.networkSliver}); + model: this.networkSliver, + modelName: "networkSliver"}); this.networkSlivers = new this.networkSliverCollection(); this.networkDeployment = XOSModel.extend({ urlRoot: NETWORKDEPLOYMENT_API, modelName: "networkDeployment" }); this.networkDeploymentCollection = XOSCollection.extend({ urlRoot: NETWORKDEPLOYMENT_API, - model: this.networkDeployment}); + model: this.networkDeployment, + modelName: "networkDeployment"}); this.networkDeployments = new this.networkDeploymentCollection(); this.service = XOSModel.extend({ urlRoot: SERVICE_API, modelName: "sliver" }); this.serviceCollection = XOSCollection.extend({ urlRoot: SERVICE_API, - model: this.service}); + model: this.service, + modelName: "service"}); this.services = new this.serviceCollection(); // enhanced REST this.slicePlus = XOSModel.extend({ urlRoot: SLICEPLUS_API, modelName: "slicePlus" }); this.slicePlusCollection = XOSCollection.extend({ urlRoot: SLICEPLUS_API, relatedCollections: {'slivers': "slice"}, - model: this.slicePlus}); + model: this.slicePlus, + modelName: "slicePlus"}); this.slicesPlus = new this.slicePlusCollection(); this.listObjects = function() { return ["slivers", "slices", "nodes", "sites", "users", "deployments"]; }; -- 2.43.0