aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/edit
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin/edit')
-rw-r--r--mediagoblin/edit/__init__.py2
-rw-r--r--mediagoblin/edit/forms.py32
-rw-r--r--mediagoblin/edit/lib.py4
-rw-r--r--mediagoblin/edit/routing.py5
-rw-r--r--mediagoblin/edit/views.py100
5 files changed, 105 insertions, 38 deletions
diff --git a/mediagoblin/edit/__init__.py b/mediagoblin/edit/__init__.py
index 576bd0f5..ba347c69 100644
--- a/mediagoblin/edit/__init__.py
+++ b/mediagoblin/edit/__init__.py
@@ -13,5 +13,3 @@
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-
diff --git a/mediagoblin/edit/forms.py b/mediagoblin/edit/forms.py
index 3d1d9fd4..d49b9b28 100644
--- a/mediagoblin/edit/forms.py
+++ b/mediagoblin/edit/forms.py
@@ -24,15 +24,21 @@ class EditForm(wtforms.Form):
title = wtforms.TextField(
_('Title'),
[wtforms.validators.Length(min=0, max=500)])
- description = wtforms.TextAreaField('Description of this work')
+ description = wtforms.TextAreaField(
+ _('Description of this work'),
+ description=_("""You can use
+ <a href="http://daringfireball.net/projects/markdown/basics">
+ Markdown</a> for formatting."""))
tags = wtforms.TextField(
_('Tags'),
- [tag_length_validator])
+ [tag_length_validator],
+ description=_(
+ "Separate tags by commas."))
slug = wtforms.TextField(
_('Slug'),
[wtforms.validators.Required(message=_("The slug can't be empty"))],
description=_(
- "The title part of this media's URL. "
+ "The title part of this media's address. "
"You usually don't need to change this."))
license = wtforms.SelectField(
_('License'),
@@ -41,11 +47,27 @@ class EditForm(wtforms.Form):
class EditProfileForm(wtforms.Form):
bio = wtforms.TextAreaField(
_('Bio'),
- [wtforms.validators.Length(min=0, max=500)])
+ [wtforms.validators.Length(min=0, max=500)],
+ description=_("""You can use
+ <a href="http://daringfireball.net/projects/markdown/basics">
+ Markdown</a> for formatting."""))
url = wtforms.TextField(
_('Website'),
[wtforms.validators.Optional(),
- wtforms.validators.URL(message='Improperly formed URL')])
+ wtforms.validators.URL(message="""This address contains errors""")])
+
+
+class EditAccountForm(wtforms.Form):
+ old_password = wtforms.PasswordField(
+ _('Old password'),
+ [wtforms.validators.Required()],
+ description=_(
+ "Enter your old password to prove you own this account."))
+ new_password = wtforms.PasswordField(
+ _('New password'),
+ [wtforms.validators.Required(),
+ wtforms.validators.Length(min=6, max=30)],
+ id="password")
class EditAttachmentsForm(wtforms.Form):
diff --git a/mediagoblin/edit/lib.py b/mediagoblin/edit/lib.py
index b722e9c1..a199cbf7 100644
--- a/mediagoblin/edit/lib.py
+++ b/mediagoblin/edit/lib.py
@@ -17,8 +17,8 @@
def may_edit_media(request, media):
"""Check, if the request's user may edit the media details"""
- if media['uploader'] == request.user['_id']:
+ if media.uploader == request.user._id:
return True
- if request.user['is_admin']:
+ if request.user.is_admin:
return True
return False
diff --git a/mediagoblin/edit/routing.py b/mediagoblin/edit/routing.py
index 34e9fd80..5216f7ca 100644
--- a/mediagoblin/edit/routing.py
+++ b/mediagoblin/edit/routing.py
@@ -20,4 +20,7 @@ from routes.route import Route
edit_routes = [
# Media editing view handled in user_pages/routing.py
Route('mediagoblin.edit.profile', '/profile/',
- controller="mediagoblin.edit.views:edit_profile")]
+ controller="mediagoblin.edit.views:edit_profile"),
+ Route('mediagoblin.edit.account', '/account/',
+ controller="mediagoblin.edit.views:edit_account")
+ ]
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index f92eabac..6f4585cf 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -26,6 +26,7 @@ from werkzeug.utils import secure_filename
from mediagoblin import messages
from mediagoblin import mg_globals
+from mediagoblin.auth import lib as auth_lib
from mediagoblin.edit import forms
from mediagoblin.edit.lib import may_edit_media
from mediagoblin.decorators import require_active_login, get_user_media_entry
@@ -43,11 +44,11 @@ def edit_media(request, media):
return exc.HTTPForbidden()
defaults = dict(
- title=media['title'],
- slug=media['slug'],
- description=media['description'],
- tags=media_tags_as_string(media['tags']),
- license=media['license'])
+ title=media.title,
+ slug=media.slug,
+ description=media.description,
+ tags=media_tags_as_string(media.tags))
+ license=media.license)
form = forms.EditForm(
request.POST,
@@ -58,33 +59,34 @@ def edit_media(request, media):
# and userid.
existing_user_slug_entries = request.db.MediaEntry.find(
{'slug': request.POST['slug'],
- 'uploader': media['uploader'],
- '_id': {'$ne': media['_id']}}).count()
+ 'uploader': media.uploader,
+ '_id': {'$ne': media._id}}).count()
if existing_user_slug_entries:
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.title = unicode(request.POST['title'])
+ media.description = unicode(request.POST.get('description'))
media['tags'] = convert_to_tag_list_of_dicts(
request.POST.get('tags'))
- media['description_html'] = cleaned_markdown_conversion(
- media['description'])
+ media.description_html = cleaned_markdown_conversion(
+ media.description)
- media['license'] = (
+ media.license = (
unicode(request.POST.get('license'))
or '')
- media['slug'] = unicode(request.POST['slug'])
+ media.slug = unicode(request.POST['slug'])
+
media.save()
return exc.HTTPFound(
location=media.url_for_self(request.urlgen))
- if request.user['is_admin'] \
- and media['uploader'] != request.user['_id'] \
+ if request.user.is_admin \
+ and media.uploader != request.user._id \
and request.method != 'POST':
messages.add_message(
request, messages.WARNING,
@@ -110,7 +112,7 @@ def edit_attachments(request, media):
attachment_public_filepath \
= mg_globals.public_store.get_unique_filepath(
- ['media_entries', unicode(media['_id']), 'attachment',
+ ['media_entries', unicode(media._id), 'attachment',
secure_filename(request.POST['attachment_file'].filename)])
attachment_public_file = mg_globals.public_store.get_file(
@@ -126,7 +128,7 @@ def edit_attachments(request, media):
name=request.POST['attachment_name'] \
or request.POST['attachment_file'].filename,
filepath=attachment_public_filepath,
- created=datetime.utcnow()
+ created=datetime.utcnow(),
))
media.save()
@@ -152,7 +154,7 @@ def edit_attachments(request, media):
def edit_profile(request):
# admins may edit any user profile given a username in the querystring
edit_username = request.GET.get('username')
- if request.user['is_admin'] and request.user['username'] != edit_username:
+ if request.user.is_admin and request.user.username != edit_username:
user = request.db.User.find_one({'username': edit_username})
# No need to warn again if admin just submitted an edited profile
if request.method != 'POST':
@@ -167,22 +169,64 @@ def edit_profile(request):
bio=user.get('bio'))
if request.method == 'POST' and form.validate():
- user['url'] = unicode(request.POST['url'])
- user['bio'] = unicode(request.POST['bio'])
+ user.url = unicode(request.POST['url'])
+ user.bio = unicode(request.POST['bio'])
- user['bio_html'] = cleaned_markdown_conversion(user['bio'])
+ user.bio_html = cleaned_markdown_conversion(user.bio)
- user.save()
+ user.save()
- messages.add_message(request,
- messages.SUCCESS,
- 'Profile edited!')
- return redirect(request,
- 'mediagoblin.user_pages.user_home',
- user=edit_username)
+ 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)
+
+ if (request.POST['old_password'] or request.POST['new_password']) and not \
+ password_matches:
+ form.old_password.errors.append(_('Wrong password'))
+
+ return render_to_response(
+ request,
+ 'mediagoblin/edit/edit_account.html',
+ {'user': user,
+ 'form': form})
+
+ if password_matches:
+ user.pw_hash = auth_lib.bcrypt_gen_password_hash(
+ request.POST['new_password'])
+
+ user.save()
+
+ messages.add_message(request,
+ messages.SUCCESS,
+ _("Account settings saved"))
+ return redirect(request,
+ 'mediagoblin.user_pages.user_home',
+ user=user.username)
+
+ return render_to_response(
+ request,
+ 'mediagoblin/edit/edit_account.html',
+ {'user': user,
+ 'form': form})