diff options
Diffstat (limited to 'mediagoblin/edit/views.py')
| -rw-r--r-- | mediagoblin/edit/views.py | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index a7245517..2bcb5694 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -34,8 +34,9 @@ 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 @@ -58,12 +59,10 @@ 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: @@ -72,9 +71,6 @@ def edit_media(request, media): 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']) @@ -123,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, @@ -171,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, @@ -180,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, |