aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/db/mongo/models.py
diff options
context:
space:
mode:
authorAaron Williamson <aaron@copiesofcopies.org>2012-01-17 01:22:02 -0500
committerAaron Williamson <aaron@copiesofcopies.org>2012-01-17 01:22:02 -0500
commita6c49d49dc1c15aedfdd7bc63a7b191ecb827787 (patch)
tree4e7bfe58a2a299b3dc936db9218cfcfc33e7311e /mediagoblin/db/mongo/models.py
parent0bfb4dc249715a7a9617c23f42d63ff8aabfd2d9 (diff)
downloadmediagoblin-a6c49d49dc1c15aedfdd7bc63a7b191ecb827787.tar.lz
mediagoblin-a6c49d49dc1c15aedfdd7bc63a7b191ecb827787.tar.xz
mediagoblin-a6c49d49dc1c15aedfdd7bc63a7b191ecb827787.zip
Fixed a syntax error in edit/views and added back in some missing license stuff from models
Diffstat (limited to 'mediagoblin/db/mongo/models.py')
-rw-r--r--mediagoblin/db/mongo/models.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/mediagoblin/db/mongo/models.py b/mediagoblin/db/mongo/models.py
index 906d2849..a95cde7d 100644
--- a/mediagoblin/db/mongo/models.py
+++ b/mediagoblin/db/mongo/models.py
@@ -22,7 +22,7 @@ from mediagoblin import mg_globals
from mediagoblin.db.mongo import migrations
from mediagoblin.db.mongo.util import ASCENDING, DESCENDING, ObjectId
from mediagoblin.tools.pagination import Pagination
-from mediagoblin.tools import url
+from mediagoblin.tools import url, licenses
from mediagoblin.db.mixin import UserMixin, MediaEntryMixin
###################
@@ -151,6 +151,8 @@ class MediaEntry(Document, MediaEntryMixin):
"unprocessed": uploaded but needs to go through processing for display
"processed": processed and able to be displayed
+ - license: URI for media's license.
+
- queued_media_file: storage interface style filepath describing a file
queued for processing. This is stored in the mg_globals.queue_store
storage system.
@@ -183,6 +185,7 @@ class MediaEntry(Document, MediaEntryMixin):
'plugin_data': dict, # plugins can dump stuff here.
'tags': [dict],
'state': unicode,
+ 'license': unicode,
# For now let's assume there can only be one main file queued
# at a time
@@ -249,6 +252,10 @@ class MediaEntry(Document, MediaEntryMixin):
for media in cursor:
return media.url_for_self(urlgen)
+ def get_license_data(self):
+ """Return license dict for requested license"""
+ return licenses.SUPPORTED_LICENSES[self['license']]
+
@property
def get_uploader(self):
return self.db.User.find_one({'_id': self.uploader})