heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #5451 - add_message inconsistencies

Browse Source 
Reformat add_message function calls for consistency and PEP8 line
continuations.
This commit is contained in:
Andrew Browning 2016-04-01 21:14:40 -04:00
parent 6b6d14f48a
commit 5c7b2a6381
7 changed files with 147 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
mediagoblin/edit/views.py
View File

@ -94,7 +94,8 @@ def edit_media(request, media):
and media.actor != request.user.id \ and media.actor != request.user.id \
and request.method != 'POST': and request.method != 'POST':
messages.add_message( messages.add_message(
request, messages.WARNING, request,
messages.WARNING,
_("You are editing another user's media. Proceed with caution.")) _("You are editing another user's media. Proceed with caution."))
return render_to_response( return render_to_response(
@ -164,10 +165,11 @@ def edit_attachments(request, media):
media.save() media.save()
messages.add_message( messages.add_message(
request, messages.SUCCESS, request,
_("You added the attachment %s!") \ messages.SUCCESS,
% (form.attachment_name.data _("You added the attachment %s!") %
or request.files['attachment_file'].filename)) (form.attachment_name.data or
request.files['attachment_file'].filename))
return redirect(request, return redirect(request,
location=media.url_for_self(request.urlgen)) location=media.url_for_self(request.urlgen))
@ -197,7 +199,8 @@ def edit_profile(request, url_user=None):
# No need to warn again if admin just submitted an edited profile # No need to warn again if admin just submitted an edited profile
if request.method != 'POST': if request.method != 'POST':
messages.add_message( messages.add_message(
request, messages.WARNING, request,
messages.WARNING,
_("You are editing a user's profile. Proceed with caution.")) _("You are editing a user's profile. Proceed with caution."))
user = url_user user = url_user
@ -227,9 +230,10 @@ def edit_profile(request, url_user=None):
user.save() user.save()
messages.add_message(request, messages.add_message(
messages.SUCCESS, request,
_("Profile changes saved")) messages.SUCCESS,
_("Profile changes saved"))
return redirect(request, return redirect(request,
'mediagoblin.user_pages.user_home', 'mediagoblin.user_pages.user_home',
user=user.username) user=user.username)
@ -260,9 +264,10 @@ def edit_account(request):
user.license_preference = form.license_preference.data user.license_preference = form.license_preference.data
user.save() user.save()
messages.add_message(request, messages.add_message(
messages.SUCCESS, request,
_("Account settings saved")) messages.SUCCESS,
_("Account settings saved"))
return redirect(request, return redirect(request,
'mediagoblin.user_pages.user_home', 'mediagoblin.user_pages.user_home',
user=user.username) user=user.username)
@ -324,7 +329,8 @@ def delete_account(request):
else: # Did not check the confirmation box... else: # Did not check the confirmation box...
messages.add_message( messages.add_message(
request, messages.WARNING, request,
messages.WARNING,
_('You need to confirm the deletion of your account.')) _('You need to confirm the deletion of your account.'))
# No POST submission or not confirmed, just show page # No POST submission or not confirmed, just show page
@ -360,8 +366,9 @@ def edit_collection(request, collection):
if existing_collection and existing_collection.id != collection.id: if existing_collection and existing_collection.id != collection.id:
messages.add_message( messages.add_message(
request, messages.ERROR, request,
_('You already have a collection called "%s"!') % \ messages.ERROR,
_('You already have a collection called "%s"!') %
form.title.data) form.title.data)
elif slug_used: elif slug_used:
form.slug.errors.append( form.slug.errors.append(
@ -379,8 +386,10 @@ def edit_collection(request, collection):
and collection.actor != request.user.id \ and collection.actor != request.user.id \
and request.method != 'POST': and request.method != 'POST':
messages.add_message( messages.add_message(
request, messages.WARNING, request,
_("You are editing another user's collection. Proceed with caution.")) messages.WARNING,
_("You are editing another user's collection. "
"Proceed with caution."))
return render_to_response( return render_to_response(
request, request,

48
mediagoblin/media_types/blog/views.py
View File

@ -32,7 +32,6 @@ from mediagoblin.media_types.blog.lib import (
may_edit_blogpost, set_blogpost_state, get_all_blogposts_of_blog, may_edit_blogpost, set_blogpost_state, get_all_blogposts_of_blog,
get_blog_by_slug) get_blog_by_slug)
from mediagoblin.messages import add_message, SUCCESS, ERROR, WARNING
from mediagoblin.decorators import (require_active_login, active_user_from_url, from mediagoblin.decorators import (require_active_login, active_user_from_url,
get_media_entry_by_id, user_may_alter_collection, get_media_entry_by_id, user_may_alter_collection,
get_user_collection, uses_pagination) get_user_collection, uses_pagination)
@ -87,8 +86,10 @@ def blog_edit(request):
user=request.user.username user=request.user.username
) )
else: else:
add_message(request, ERROR, "Welcome! You already have created \ messages.add_message(
maximum number of blogs.") request,
messages.ERROR,
"Welcome! You already have created maximum number of blogs.")
return redirect(request, "mediagoblin.media_types.blog.blog_admin_dashboard", return redirect(request, "mediagoblin.media_types.blog.blog_admin_dashboard",
user=request.user.username) user=request.user.username)
@ -120,7 +121,10 @@ def blog_edit(request):
blog.generate_slug() blog.generate_slug()
blog.save() blog.save()
add_message(request, SUCCESS, "Your blog is updated.") messages.add_message(
request,
messages.SUCCESS,
"Your blog is updated.")
return redirect(request, "mediagoblin.media_types.blog.blog-dashboard", return redirect(request, "mediagoblin.media_types.blog.blog-dashboard",
user=request.user.username, user=request.user.username,
blog_slug=blog.slug) blog_slug=blog.slug)
@ -155,7 +159,10 @@ def blogpost_create(request):
blog_post_data.media_entry = blogpost.id blog_post_data.media_entry = blogpost.id
blog_post_data.save() blog_post_data.save()
add_message(request, SUCCESS, _('Woohoo! Submitted!')) messages.add_message(
request,
messages.SUCCESS,
_('Woohoo! Submitted!'))
add_comment_subscription(request.user, blogpost) add_comment_subscription(request.user, blogpost)
return redirect(request, "mediagoblin.media_types.blog.blog-dashboard", return redirect(request, "mediagoblin.media_types.blog.blog-dashboard",
user=request.user.username, user=request.user.username,
@ -197,7 +204,10 @@ def blogpost_edit(request):
blogpost.generate_slug() blogpost.generate_slug()
blogpost.save() blogpost.save()
add_message(request, SUCCESS, _('Woohoo! edited blogpost is submitted')) messages.add_message(
request,
messages.SUCCESS,
_('Woohoo! edited blogpost is submitted'))
return redirect(request, "mediagoblin.media_types.blog.blog-dashboard", return redirect(request, "mediagoblin.media_types.blog.blog-dashboard",
user=request.user.username, user=request.user.username,
blog_slug=blog.slug) blog_slug=blog.slug)
@ -320,20 +330,25 @@ def blog_delete(request, **kwargs):
if request.method == 'POST' and form.validate(): if request.method == 'POST' and form.validate():
if form.confirm.data is True: if form.confirm.data is True:
blog.delete() blog.delete()
add_message( messages.add_message(
request, SUCCESS, _('You deleted the Blog.')) request,
messages.SUCCESS,
_('You deleted the Blog.'))
return redirect(request, "mediagoblin.media_types.blog.blog_admin_dashboard", return redirect(request, "mediagoblin.media_types.blog.blog_admin_dashboard",
user=request.user.username) user=request.user.username)
else: else:
add_message( messages.add_message(
request, ERROR, request,
_("The media was not deleted because you didn't check that you were sure.")) messages.ERROR,
_("The media was not deleted because you didn't check "
"that you were sure."))
return redirect(request, "mediagoblin.media_types.blog.blog_admin_dashboard", return redirect(request, "mediagoblin.media_types.blog.blog_admin_dashboard",
user=request.user.username) user=request.user.username)
else: else:
if request.user.has_privilege(u'admin'): if request.user.has_privilege(u'admin'):
add_message( messages.add_message(
request, WARNING, request,
messages.WARNING,
_("You are about to delete another user's Blog. " _("You are about to delete another user's Blog. "
"Proceed with caution.")) "Proceed with caution."))
return render_to_response( return render_to_response(
@ -343,9 +358,10 @@ def blog_delete(request, **kwargs):
'form':form 'form':form
}) })
else: else:
add_message( messages.add_message(
request, ERROR, request,
_("The blog was not deleted because you have no rights.")) messages.ERROR,
_("The blog was not deleted because you have no rights."))
return redirect(request, "mediagoblin.media_types.blog.blog_admin_dashboard", return redirect(request, "mediagoblin.media_types.blog.blog_admin_dashboard",
user=request.user.username) user=request.user.username)

17
mediagoblin/notifications/views.py
View File

@ -30,10 +30,10 @@ def subscribe_comments(request, media):
add_comment_subscription(request.user, media) add_comment_subscription(request.user, media)
messages.add_message(request, messages.add_message(
messages.SUCCESS, request,
_('Subscribed to comments on %s!') messages.SUCCESS,
% media.title) _('Subscribed to comments on %s!') % media.title)
return redirect(request, location=media.url_for_self(request.urlgen)) return redirect(request, location=media.url_for_self(request.urlgen))
@ -43,10 +43,11 @@ def subscribe_comments(request, media):
def silence_comments(request, media): def silence_comments(request, media):
silence_comment_subscription(request.user, media) silence_comment_subscription(request.user, media)
messages.add_message(request, messages.add_message(
messages.SUCCESS, request,
_('You will not receive notifications for comments on' messages.SUCCESS,
' %s.') % media.title) _('You will not receive notifications for comments on %s.') %
media.title)
return redirect(request, location=media.url_for_self(request.urlgen)) return redirect(request, location=media.url_for_self(request.urlgen))

27
mediagoblin/plugins/basic_auth/views.py
View File

@ -60,9 +60,10 @@ def forgot_password(request):
username=fp_form.username.data).first() username=fp_form.username.data).first()
if user is None: if user is None:
messages.add_message(request, messages.add_message(
messages.WARNING, request,
_("Couldn't find someone with that username.")) messages.WARNING,
_("Couldn't find someone with that username."))
return redirect(request, return redirect(request,
'mediagoblin.plugins.basic_auth.forgot_password') 'mediagoblin.plugins.basic_auth.forgot_password')
@ -71,10 +72,11 @@ def forgot_password(request):
if user and user.has_privilege(u'active') is False: if user and user.has_privilege(u'active') is False:
# Don't send reminder because user is inactive or has no verified email # Don't send reminder because user is inactive or has no verified email
messages.add_message(request, messages.add_message(
request,
messages.WARNING, messages.WARNING,
_("Could not send password recovery email as your username is in" _("Could not send password recovery email as your username is "
"active or your account's email address has not been verified.")) "inactive or your account's email address has not been verified."))
return redirect(request, 'mediagoblin.user_pages.user_home', return redirect(request, 'mediagoblin.user_pages.user_home',
user=user.username) user=user.username)
@ -154,15 +156,17 @@ def verify_forgot_password(request):
# #
# if not user.email_verified: # if not user.email_verified:
# messages.add_message( # messages.add_message(
# request, messages.ERROR, # request,
# messages.ERROR,
# _('You need to verify your email before you can reset your' # _('You need to verify your email before you can reset your'
# ' password.')) # ' password.'))
if not user.status == 'active': if not user.status == 'active':
messages.add_message( messages.add_message(
request, messages.ERROR, request,
_('You are no longer an active user. Please contact the system' messages.ERROR,
' admin to reactivate your account.')) _("You are no longer an active user. Please contact the system "
"admin to reactivate your account."))
return redirect( return redirect(
request, 'index') request, 'index')
@ -212,7 +216,8 @@ def change_pass(request):
user.save() user.save()
messages.add_message( messages.add_message(
request, messages.SUCCESS, request,
messages.SUCCESS,
_('Your password was changed successfully')) _('Your password was changed successfully'))
return redirect(request, 'mediagoblin.edit.account') return redirect(request, 'mediagoblin.edit.account')

18
mediagoblin/submit/views.py
View File

@ -29,7 +29,6 @@ from mediagoblin.tools.translate import pass_to_ugettext as _
from mediagoblin.tools.response import render_to_response, redirect from mediagoblin.tools.response import render_to_response, redirect
from mediagoblin.decorators import require_active_login, user_has_privilege from mediagoblin.decorators import require_active_login, user_has_privilege
from mediagoblin.submit import forms as submit_forms from mediagoblin.submit import forms as submit_forms
from mediagoblin.messages import add_message, SUCCESS
from mediagoblin.media_types import FileTypeNotSupported from mediagoblin.media_types import FileTypeNotSupported
from mediagoblin.submit.lib import \ from mediagoblin.submit.lib import \
check_file_field, submit_media, get_upload_file_limits, \ check_file_field, submit_media, get_upload_file_limits, \
@ -87,7 +86,10 @@ def submit_start(request):
"add", media, request.user, "add", media, request.user,
target=submit_form.collection.data) target=submit_form.collection.data)
add_message(request, SUCCESS, _('Woohoo! Submitted!')) messages.add_message(
request,
messages.SUCCESS,
_('Woohoo! Submitted!'))
return redirect(request, "mediagoblin.user_pages.user_home", return redirect(request, "mediagoblin.user_pages.user_home",
user=request.user.username) user=request.user.username)
@ -143,13 +145,17 @@ def add_collection(request, media=None):
title=collection.title).first() title=collection.title).first()
if existing_collection: if existing_collection:
add_message(request, messages.ERROR, messages.add_message(
_('You already have a collection called "%s"!') \ request,
% collection.title) messages.ERROR,
_('You already have a collection called "%s"!') %
collection.title)
else: else:
collection.save() collection.save()
add_message(request, SUCCESS, messages.add_message(
request,
messages.SUCCESS,
_('Collection "%s" added!') % collection.title) _('Collection "%s" added!') % collection.title)
return redirect(request, "mediagoblin.user_pages.user_home", return redirect(request, "mediagoblin.user_pages.user_home",

4
mediagoblin/tools/mail.py
View File

@ -163,6 +163,8 @@ def email_debug_message(request):
""" """
if mg_globals.app_config['email_debug_mode']: if mg_globals.app_config['email_debug_mode']:
# DEBUG message, no need to translate # DEBUG message, no need to translate
messages.add_message(request, messages.DEBUG, messages.add_message(
request,
messages.DEBUG,
"This instance is running in email debug mode. " "This instance is running in email debug mode. "
"The email will be on the console of the server process.") "The email will be on the console of the server process.")

73
mediagoblin/user_pages/views.py
View File

@ -205,7 +205,8 @@ def media_post_comment(request, media):
link.save() link.save()
messages.add_message( messages.add_message(
request, messages.SUCCESS, request,
messages.SUCCESS,
_('Your comment has been posted!')) _('Your comment has been posted!'))
trigger_notification(link, media, request) trigger_notification(link, media, request)
@ -240,7 +241,9 @@ def media_collect(request, media):
if request.method != 'POST' or not form.validate(): if request.method != 'POST' or not form.validate():
# No POST submission, or invalid form # No POST submission, or invalid form
if not form.validate(): if not form.validate():
messages.add_message(request, messages.ERROR, messages.add_message(
request,
messages.ERROR,
_('Please check your entries and try again.')) _('Please check your entries and try again.'))
return render_to_response( return render_to_response(
@ -259,9 +262,11 @@ def media_collect(request, media):
type=Collection.USER_DEFINED_TYPE type=Collection.USER_DEFINED_TYPE
).first() ).first()
if existing_collection: if existing_collection:
messages.add_message(request, messages.ERROR, messages.add_message(
_('You already have a collection called "%s"!') request,
% existing_collection.title) messages.ERROR,
_('You already have a collection called "%s"!') %
existing_collection.title)
return redirect(request, "mediagoblin.user_pages.media_home", return redirect(request, "mediagoblin.user_pages.media_home",
user=media.get_actor.username, user=media.get_actor.username,
media=media.slug_or_id) media=media.slug_or_id)
@ -291,7 +296,8 @@ def media_collect(request, media):
if not collection: if not collection:
messages.add_message( messages.add_message(
request, messages.ERROR, request,
messages.ERROR,
_('You have to select or add a collection')) _('You have to select or add a collection'))
return redirect(request, "mediagoblin.user_pages.media_collect", return redirect(request, "mediagoblin.user_pages.media_collect",
user=media.get_actor.username, user=media.get_actor.username,
@ -299,15 +305,19 @@ def media_collect(request, media):
# Check whether media already exists in collection # Check whether media already exists in collection
elif item is not None: elif item is not None:
messages.add_message(request, messages.ERROR, messages.add_message(
_('"%s" already in collection "%s"') request,
% (media.title, collection.title)) messages.ERROR,
_('"%s" already in collection "%s"') %
(media.title, collection.title))
else: # Add item to collection else: # Add item to collection
add_media_to_collection(collection, media, form.note.data) add_media_to_collection(collection, media, form.note.data)
create_activity("add", media, request.user, target=collection) create_activity("add", media, request.user, target=collection)
messages.add_message(request, messages.SUCCESS, messages.add_message(
_('"%s" added to collection "%s"') request,
% (media.title, collection.title)) messages.SUCCESS,
_('"%s" added to collection "%s"') %
(media.title, collection.title))
return redirect_obj(request, media) return redirect_obj(request, media)
@ -337,7 +347,9 @@ def media_confirm_delete(request, media):
# Delete MediaEntry and all related files, comments etc. # Delete MediaEntry and all related files, comments etc.
media.delete() media.delete()
messages.add_message( messages.add_message(
request, messages.SUCCESS, _('You deleted the media.')) request,
messages.SUCCESS,
_('You deleted the media.'))
location = media.url_to_next(request.urlgen) location = media.url_to_next(request.urlgen)
if not location: if not location:
@ -348,14 +360,17 @@ def media_confirm_delete(request, media):
return redirect(request, location=location) return redirect(request, location=location)
else: else:
messages.add_message( messages.add_message(
request, messages.ERROR, request,
_("The media was not deleted because you didn't check that you were sure.")) messages.ERROR,
_("The media was not deleted because you didn't check "
"that you were sure."))
return redirect_obj(request, media) return redirect_obj(request, media)
if ((request.user.has_privilege(u'admin') and if ((request.user.has_privilege(u'admin') and
request.user.id != media.actor)): request.user.id != media.actor)):
messages.add_message( messages.add_message(
request, messages.WARNING, request,
messages.WARNING,
_("You are about to delete another user's media. " _("You are about to delete another user's media. "
"Proceed with caution.")) "Proceed with caution."))
@ -429,18 +444,23 @@ def collection_item_confirm_remove(request, collection_item):
collection.save() collection.save()
messages.add_message( messages.add_message(
request, messages.SUCCESS, _('You deleted the item from the collection.')) request,
messages.SUCCESS,
_('You deleted the item from the collection.'))
else: else:
messages.add_message( messages.add_message(
request, messages.ERROR, request,
_("The item was not removed because you didn't check that you were sure.")) messages.ERROR,
_("The item was not removed because you didn't check "
"that you were sure."))
return redirect_obj(request, collection) return redirect_obj(request, collection)
if ((request.user.has_privilege(u'admin') and if ((request.user.has_privilege(u'admin') and
request.user.id != collection_item.in_collection.actor)): request.user.id != collection_item.in_collection.actor)):
messages.add_message( messages.add_message(
request, messages.WARNING, request,
messages.WARNING,
_("You are about to delete an item from another user's collection. " _("You are about to delete an item from another user's collection. "
"Proceed with caution.")) "Proceed with caution."))
@ -476,15 +496,20 @@ def collection_confirm_delete(request, collection):
item.delete() item.delete()
collection.delete() collection.delete()
messages.add_message(request, messages.SUCCESS, messages.add_message(
_('You deleted the collection "%s"') % collection_title) request,
messages.SUCCESS,
_('You deleted the collection "%s"') %
collection_title)
return redirect(request, "mediagoblin.user_pages.user_home", return redirect(request, "mediagoblin.user_pages.user_home",
user=username) user=username)
else: else:
messages.add_message( messages.add_message(
request, messages.ERROR, request,
_("The collection was not deleted because you didn't check that you were sure.")) messages.ERROR,
_("The collection was not deleted because you didn't "
"check that you were sure."))
return redirect_obj(request, collection) return redirect_obj(request, collection)