# 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
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
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,
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(
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,
url=user.get('url'),
bio=user.get('bio'))
+ if request.method == 'POST' and form.validate():
+ user.url = unicode(request.POST['url'])
+ user.bio = unicode(request.POST['bio'])
+
+ user.save()
+
+ messages.add_message(request,
+ messages.SUCCESS,
+ _("Profile changes saved"))
+ return redirect(request,
+ 'mediagoblin.user_pages.user_home',
+ user=user.username)
+
+ return render_to_response(
+ request,
+ 'mediagoblin/edit/edit_profile.html',
+ {'user': user,
+ 'form': form})
+
+
+@require_active_login
+def edit_account(request):
+ edit_username = request.GET.get('username')
+ user = request.user
+
+ form = forms.EditAccountForm(request.POST)
+
if request.method == 'POST' and form.validate():
password_matches = auth_lib.bcrypt_check_password(
request.POST['old_password'],
- user['pw_hash'])
+ user.pw_hash)
if (request.POST['old_password'] or request.POST['new_password']) and not \
password_matches:
return render_to_response(
request,
- 'mediagoblin/edit/edit_profile.html',
+ 'mediagoblin/edit/edit_account.html',
{'user': user,
'form': form})
- user.url = unicode(request.POST['url'])
- user.bio = unicode(request.POST['bio'])
-
if password_matches:
- user['pw_hash'] = auth_lib.bcrypt_gen_password_hash(
+ user.pw_hash = auth_lib.bcrypt_gen_password_hash(
request.POST['new_password'])
- user.bio_html = cleaned_markdown_conversion(user['bio'])
-
user.save()
messages.add_message(request,
messages.SUCCESS,
- _("Profile edited!"))
+ _("Account settings saved"))
return redirect(request,
'mediagoblin.user_pages.user_home',
- user=user['username'])
+ user=user.username)
return render_to_response(
request,
- 'mediagoblin/edit/edit_profile.html',
+ 'mediagoblin/edit/edit_account.html',
{'user': user,
'form': form})