X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Fedit%2Fviews.py;h=2bcb56946a2c02be754b37814154930c98fcc1a9;hb=9dcd8436a9c97276e69b208c7c110d5875d1400d;hp=ec748028300c17a175ff9e6227ae7dfd7549ecc1;hpb=0ab21f981a8a170f5bf4e83f7d56d3ed8fdae467;p=mediagoblin.git

diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index ec748028..2bcb5694 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -34,7 +34,10 @@ from mediagoblin.tools.response import render_to_response, redirect
 from mediagoblin.tools.translate import pass_to_ugettext as _
 from mediagoblin.tools.text import (
     clean_html, convert_to_tag_list_of_dicts,
-    media_tags_as_string, cleaned_markdown_conversion)
+    media_tags_as_string)
+from mediagoblin.tools.licenses import SUPPORTED_LICENSES
+from mediagoblin.db.util import check_media_slug_used
+
 
 @get_user_media_entry
 @require_active_login
@@ -46,7 +49,8 @@ def edit_media(request, media):
         title=media.title,
         slug=media.slug,
         description=media.description,
-        tags=media_tags_as_string(media.tags))
+        tags=media_tags_as_string(media.tags),
+        license=media.license)
 
     form = forms.EditForm(
         request.POST,
@@ -55,24 +59,22 @@ def edit_media(request, media):
     if request.method == 'POST' and form.validate():
         # Make sure there isn't already a MediaEntry with such a slug
         # and userid.
-        existing_user_slug_entries = request.db.MediaEntry.find(
-            {'slug': request.POST['slug'],
-             'uploader': media.uploader,
-             '_id': {'$ne': media._id}}).count()
+        slug_used = check_media_slug_used(request.db, media.uploader,
+                request.POST['slug'], media.id)
 
-        if existing_user_slug_entries:
+        if slug_used:
             form.slug.errors.append(
                 _(u'An entry with that slug already exists for this user.'))
         else:
             media.title = unicode(request.POST['title'])
             media.description = unicode(request.POST.get('description'))
-            media['tags'] = convert_to_tag_list_of_dicts(
+            media.tags = convert_to_tag_list_of_dicts(
                                    request.POST.get('tags'))
 
-            media.description_html = cleaned_markdown_conversion(
-                media.description)
+            media.license = unicode(request.POST.get('license', '')) or None
 
             media.slug = unicode(request.POST['slug'])
+
             media.save()
 
             return exc.HTTPFound(
@@ -117,7 +119,7 @@ def edit_attachments(request, media):
             finally:
                 request.POST['attachment_file'].file.close()
 
-            media['attachment_files'].append(dict(
+            media.attachment_files.append(dict(
                     name=request.POST['attachment_name'] \
                         or request.POST['attachment_file'].filename,
                     filepath=attachment_public_filepath,
@@ -165,8 +167,6 @@ def edit_profile(request):
         user.url = unicode(request.POST['url'])
         user.bio = unicode(request.POST['bio'])
 
-        user.bio_html = cleaned_markdown_conversion(user.bio)
-
         user.save()
 
         messages.add_message(request,
@@ -174,7 +174,7 @@ def edit_profile(request):
                              _("Profile changes saved"))
         return redirect(request,
                        'mediagoblin.user_pages.user_home',
-                        user=user['username'])
+                        user=user.username)
 
     return render_to_response(
         request,