Merge branch 'master' onto local working copy

Preserve working copy while updating

1 files changed, 0 insertions, 26 deletions

diff --git a/web-server/opendc/models/prefab.py b/web-server/opendc/models/prefab.py
deleted file mode 100644
index 70910c4a..00000000
--- a/web-server/opendc/models/prefab.py
+++ /dev/null
@@ -1,26 +0,0 @@
-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 Prefab(Model):
-    """Model representing a Project."""
-
-    collection_name = 'prefabs'
-
-    def check_user_access(self, google_id):
-        """Raises an error if the user with given [google_id] has insufficient access to view this prefab.
-
-        :param google_id: The Google ID of the user.
-        """
-        user = User.from_google_id(google_id)
-
-        #try:
-
-        print(self.obj)
-        if self.obj['authorId'] != user.get_id() and self.obj['visibility'] == "private":
-            raise ClientError(Response(403, "Forbidden from retrieving prefab."))
-        #except KeyError:
-            # OpenDC-authored objects don't necessarily have an authorId
-        #    return