Fixed a syntax error in edit/views and added back in some missing license stuff from...

diff --git a/mediagoblin/db/mongo/models.py b/mediagoblin/db/mongo/models.py
index 906d284934e0c68c10091b08616209e11c771608..a95cde7dbd8c6c1c85f6ab854e7aab431adde402 100644 (file)
--- 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})

diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index 6f4585cf217b2a526c5153f55e93392ee61fb4f8..a3b269d842953a0fa728658a1bc0006102809040 100644 (file)
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -47,8 +47,8 @@ def edit_media(request, media):
         title=media.title,
         slug=media.slug,
         description=media.description,
-        tags=media_tags_as_string(media.tags))
-        license=media.license)
+        tags=media_tags_as_string(media.tags),
+        license=media.license))
 
     form = forms.EditForm(
         request.POST,