Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
diff --git a/planetstack/core/xoslib/objects/sliceplus.py b/planetstack/core/xoslib/objects/sliceplus.py
index a5d7a7e..6e586d2 100644
--- a/planetstack/core/xoslib/objects/sliceplus.py
+++ b/planetstack/core/xoslib/objects/sliceplus.py
@@ -18,7 +18,7 @@
roles = []
if (user!=None):
- roles = [x.role for x in self.slice_privileges.filter(user=user)]
+ roles = [x.role for x in self.sliceprivileges.filter(user=user)]
return {"sitesUsed": used_sites,
"deploymentsUsed": used_deployments,
diff --git a/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js b/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js
index f615c30..bbf13a4 100644
--- a/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js
+++ b/planetstack/core/xoslib/static/js/xoslib/xos-backbone.js
@@ -264,7 +264,11 @@
modelName = attrs.modelName;
modelClassName = modelName;
collectionClassName = modelName + "Collection";
- collectionName = modelName + "s";
+
+ if (!attrs.collectionName) {
+ attrs.collectionName = modelName + "s";
+ }
+ collectionName = attrs.collectionName;
modelAttrs = {}
collectionAttrs = {}
@@ -364,7 +368,8 @@
// enhanced REST
define_model(this, {urlRoot: SLICEPLUS_API,
relatedCollections: {'slivers': "slice"},
- modelName: "slicePlus"});
+ modelName: "slicePlus",
+ collectionName: "slicesPlus"});
this.listObjects = function() { return this.allCollectionNames; };