diff options
Diffstat (limited to 'web-server/opendc/models')
| -rw-r--r-- | web-server/opendc/models/model.py | 4 | ||||
| -rw-r--r-- | web-server/opendc/models/topology.py | 4 | ||||
| -rw-r--r-- | web-server/opendc/models/trace.py | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/web-server/opendc/models/model.py b/web-server/opendc/models/model.py index 2505ae61..b2fd1844 100644 --- a/web-server/opendc/models/model.py +++ b/web-server/opendc/models/model.py @@ -10,6 +10,10 @@ class Model: def from_id(cls, _id): return cls(DB.fetch_one({'_id': _id}, Model.collection_name)) + @classmethod + def get_all(cls): + return cls(DB.fetch_all({}, Model.collection_name)) + def __init__(self, obj): self.obj = obj diff --git a/web-server/opendc/models/topology.py b/web-server/opendc/models/topology.py index 6dde3e2a..37b4c5c8 100644 --- a/web-server/opendc/models/topology.py +++ b/web-server/opendc/models/topology.py @@ -9,7 +9,7 @@ class Topology(Model): def check_user_access(self, google_id, edit_access): user = User.from_google_id(google_id) - authorizations = list( - filter(lambda x: str(x['topologyId']) == str(self.obj['_id']), user.obj['authorizations'])) + authorizations = list(filter(lambda x: str(x['topologyId']) == str(self.obj['_id']), + user.obj['authorizations'])) if len(authorizations) == 0 or (edit_access and authorizations[0]['authorizationLevel'] == 'VIEW'): raise ClientError(Response(403, "Forbidden from retrieving topology.")) diff --git a/web-server/opendc/models/trace.py b/web-server/opendc/models/trace.py index 916db073..c18f8ea2 100644 --- a/web-server/opendc/models/trace.py +++ b/web-server/opendc/models/trace.py @@ -1,7 +1,4 @@ from opendc.models.model import Model -from opendc.models.user import User -from opendc.util.exceptions import ClientError -from opendc.util.rest import Response class Trace(Model): |