Merge branch 'master' onto local working copy

Preserve working copy while updating

1 files changed, 0 insertions, 31 deletions

diff --git a/web-server/opendc/models/project.py b/web-server/opendc/models/project.py
deleted file mode 100644
index b57e9f77..00000000
--- a/web-server/opendc/models/project.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from opendc.models.model import Model
-from opendc.models.user import User
-from opendc.util.database import DB
-from opendc.util.exceptions import ClientError
-from opendc.util.rest import Response
-
-
-class Project(Model):
-    """Model representing a Project."""
-
-    collection_name = 'projects'
-
-    def check_user_access(self, google_id, edit_access):
-        """Raises an error if the user with given [google_id] has insufficient access.
-
-        :param google_id: The Google ID of the user.
-        :param edit_access: True when edit access should be checked, otherwise view access.
-        """
-        user = User.from_google_id(google_id)
-        authorizations = list(filter(lambda x: str(x['projectId']) == str(self.get_id()),
-                                     user.obj['authorizations']))
-        if len(authorizations) == 0 or (edit_access and authorizations[0]['authorizationLevel'] == 'VIEW'):
-            raise ClientError(Response(403, "Forbidden from retrieving project."))
-
-    def get_all_authorizations(self):
-        """Get all user IDs having access to this project."""
-        return [
-            str(user['_id']) for user in DB.fetch_all({'authorizations': {
-                'projectId': self.obj['_id']
-            }}, User.collection_name)
-        ]