Use django.contrib.messages for feedback
--- .../static/djangobb_forum/themes/default/style.css | 37 +++++++++++ djangobb_forum/templates/djangobb_forum/base.html | 20 +++++- djangobb_forum/views.py | 64 ++++++++++++++------ 3 files changed, 102 insertions(+), 19 deletions(-)
This commit is contained in:
parent
eef26f36c4
commit
f089e88011
3 changed files with 102 additions and 19 deletions
djangobb_forum
|
@ -1,5 +1,5 @@
|
|||
import math
|
||||
from datetime import datetime, timedelta
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
from django.shortcuts import get_object_or_404, render
|
||||
from django.http import Http404, HttpResponse, HttpResponseRedirect, HttpResponseForbidden
|
||||
|
@ -12,13 +12,14 @@ from django.db.models import Q, F, Sum
|
|||
from django.utils.encoding import smart_str
|
||||
from django.db import transaction
|
||||
from django.views.decorators.csrf import csrf_exempt
|
||||
from django.utils.translation import ugettext as _
|
||||
|
||||
from djangobb_forum.util import build_form, paginate, set_language
|
||||
from djangobb_forum.models import Category, Forum, Topic, Post, Profile, Reputation,\
|
||||
from djangobb_forum.models import Category, Forum, Topic, Post, Profile, Reputation, \
|
||||
Attachment, PostTracking
|
||||
from djangobb_forum.forms import AddPostForm, EditPostForm, UserSearchForm,\
|
||||
PostSearchForm, ReputationForm, MailToForm, EssentialsProfileForm,\
|
||||
PersonalProfileForm, MessagingProfileForm, PersonalityProfileForm,\
|
||||
from djangobb_forum.forms import AddPostForm, EditPostForm, UserSearchForm, \
|
||||
PostSearchForm, ReputationForm, MailToForm, EssentialsProfileForm, \
|
||||
PersonalProfileForm, MessagingProfileForm, PersonalityProfileForm, \
|
||||
DisplayProfileForm, PrivacyProfileForm, ReportForm, UploadAvatarForm
|
||||
from djangobb_forum.templatetags import forum_extras
|
||||
from djangobb_forum import settings as forum_settings
|
||||
|
@ -26,11 +27,12 @@ from djangobb_forum.util import smiles, convert_text_to_html, TopicFromPostResul
|
|||
from djangobb_forum.templatetags.forum_extras import forum_moderated_by
|
||||
|
||||
from haystack.query import SearchQuerySet, SQ
|
||||
from django.contrib import messages
|
||||
|
||||
|
||||
def index(request, full=True):
|
||||
users_cached = cache.get('djangobb_users_online', {})
|
||||
users_online = users_cached and User.objects.filter(id__in = users_cached.keys()) or []
|
||||
users_online = users_cached and User.objects.filter(id__in=users_cached.keys()) or []
|
||||
guests_cached = cache.get('djangobb_guests_online', {})
|
||||
guest_count = len(guests_cached)
|
||||
users_count = len(users_online)
|
||||
|
@ -76,7 +78,7 @@ def moderate(request, forum_id):
|
|||
if request.user.is_superuser or request.user in forum.moderators.all():
|
||||
topic_ids = request.POST.getlist('topic_id')
|
||||
if 'move_topics' in request.POST:
|
||||
return render(request, 'djangobb_forum/move_topic.html', {
|
||||
return render(request, 'djangobb_forum/move_topic.html', {
|
||||
'categories': Category.objects.all(),
|
||||
'topic_ids': topic_ids,
|
||||
'exclude_forum': forum,
|
||||
|
@ -85,14 +87,17 @@ def moderate(request, forum_id):
|
|||
for topic_id in topic_ids:
|
||||
topic = get_object_or_404(Topic, pk=topic_id)
|
||||
topic.delete()
|
||||
messages.success(request, _("Topics deleted"))
|
||||
return HttpResponseRedirect(reverse('djangobb:index'))
|
||||
elif 'open_topics' in request.POST:
|
||||
for topic_id in topic_ids:
|
||||
open_close_topic(request, topic_id, 'o')
|
||||
messages.success(request, _("Topics opened"))
|
||||
return HttpResponseRedirect(reverse('djangobb:index'))
|
||||
elif 'close_topics' in request.POST:
|
||||
for topic_id in topic_ids:
|
||||
open_close_topic(request, topic_id, 'c')
|
||||
messages.success(request, _("Topics closed"))
|
||||
return HttpResponseRedirect(reverse('djangobb:index'))
|
||||
|
||||
return render(request, 'djangobb_forum/moderate.html', {'forum': forum,
|
||||
|
@ -195,9 +200,10 @@ def search(request):
|
|||
def misc(request):
|
||||
if 'action' in request.GET:
|
||||
action = request.GET['action']
|
||||
if action =='markread':
|
||||
if action == 'markread':
|
||||
user = request.user
|
||||
PostTracking.objects.filter(user__id=user.id).update(last_read=datetime.now(), topics=None)
|
||||
messages.info(request, _("All topics marked as read."))
|
||||
return HttpResponseRedirect(reverse('djangobb:index'))
|
||||
|
||||
elif action == 'report':
|
||||
|
@ -207,6 +213,7 @@ def misc(request):
|
|||
form = build_form(ReportForm, request, reported_by=request.user, post=post_id)
|
||||
if request.method == 'POST' and form.is_valid():
|
||||
form.save()
|
||||
messages.info(request, _("Post reported."))
|
||||
return HttpResponseRedirect(post.get_absolute_url())
|
||||
return render(request, 'djangobb_forum/report.html', {'form':form})
|
||||
|
||||
|
@ -219,6 +226,7 @@ def misc(request):
|
|||
request.user.username,
|
||||
request.user.email)
|
||||
user.email_user(subject, body, request.user.email)
|
||||
messages.success(request, _("Email send."))
|
||||
return HttpResponseRedirect(reverse('djangobb:index'))
|
||||
|
||||
elif 'mail_to' in request.GET:
|
||||
|
@ -250,6 +258,12 @@ def show_forum(request, forum_id, full=True):
|
|||
|
||||
@transaction.commit_on_success
|
||||
def show_topic(request, topic_id, full=True):
|
||||
# messages.debug(request, "test debug.")
|
||||
# messages.info(request, "test info.")
|
||||
# messages.success(request, "test success.")
|
||||
# messages.warning(request, "test warning.")
|
||||
# messages.error(request, "test error.")
|
||||
|
||||
topic = get_object_or_404(Topic.objects.select_related(), pk=topic_id)
|
||||
if not topic.forum.category.has_access(request.user):
|
||||
return HttpResponseForbidden()
|
||||
|
@ -308,6 +322,7 @@ def add_post(request, forum_id, topic_id):
|
|||
if not topic.forum.category.has_access(request.user):
|
||||
return HttpResponseForbidden()
|
||||
if topic and topic.closed:
|
||||
messages.error(request, _("This topic is closed."))
|
||||
return HttpResponseRedirect(topic.get_absolute_url())
|
||||
|
||||
ip = request.META.get('REMOTE_ADDR', None)
|
||||
|
@ -322,6 +337,7 @@ def add_post(request, forum_id, topic_id):
|
|||
|
||||
if form.is_valid():
|
||||
post = form.save();
|
||||
messages.success(request, _("Topic saved."))
|
||||
return HttpResponseRedirect(post.get_absolute_url())
|
||||
|
||||
return render(request, 'djangobb_forum/add_post.html', {'form': form,
|
||||
|
@ -338,6 +354,7 @@ def upload_avatar(request, username, template=None, form_class=None):
|
|||
form = build_form(form_class, request, instance=user.forum_profile)
|
||||
if request.method == 'POST' and form.is_valid():
|
||||
form.save()
|
||||
messages.success(request, _("Your avatar uploaded."))
|
||||
return HttpResponseRedirect(reverse('djangobb:forum_profile', args=[user.username]))
|
||||
return render(request, template, {'form': form,
|
||||
'avatar_width': forum_settings.AVATAR_WIDTH,
|
||||
|
@ -346,6 +363,7 @@ def upload_avatar(request, username, template=None, form_class=None):
|
|||
else:
|
||||
topic_count = Topic.objects.filter(user__id=user.id).count()
|
||||
if user.forum_profile.post_count < forum_settings.POST_USER_SEARCH and not request.user.is_authenticated():
|
||||
messages.error(request, _("Please sign in."))
|
||||
return HttpResponseRedirect(reverse('user_signin') + '?next=%s' % request.path)
|
||||
return render(request, template, {'profile': user,
|
||||
'topic_count': topic_count,
|
||||
|
@ -360,6 +378,7 @@ def user(request, username, section='essentials', action=None, template='djangob
|
|||
form = build_form(form_class, request, instance=user.forum_profile, extra_args={'request': request})
|
||||
if request.method == 'POST' and form.is_valid():
|
||||
form.save()
|
||||
messages.success(request, _("User profile saved."))
|
||||
return HttpResponseRedirect(profile_url)
|
||||
return render(request, template, {'active_menu': section,
|
||||
'profile': user,
|
||||
|
@ -369,6 +388,7 @@ def user(request, username, section='essentials', action=None, template='djangob
|
|||
template = 'djangobb_forum/user.html'
|
||||
topic_count = Topic.objects.filter(user__id=user.id).count()
|
||||
if user.forum_profile.post_count < forum_settings.POST_USER_SEARCH and not request.user.is_authenticated():
|
||||
messages.error(request, _("Please sign in."))
|
||||
return HttpResponseRedirect(reverse('user_signin') + '?next=%s' % request.path)
|
||||
return render(request, template, {'profile': user,
|
||||
'topic_count': topic_count,
|
||||
|
@ -400,13 +420,15 @@ def reputation(request, username):
|
|||
if 'del_reputation' in request.POST and request.user.is_superuser:
|
||||
reputation_list = request.POST.getlist('reputation_id')
|
||||
for reputation_id in reputation_list:
|
||||
reputation = get_object_or_404(Reputation, pk=reputation_id)
|
||||
reputation.delete()
|
||||
reputation = get_object_or_404(Reputation, pk=reputation_id)
|
||||
reputation.delete()
|
||||
messages.success(request, _("Reputation deleted."))
|
||||
return HttpResponseRedirect(reverse('djangobb:index'))
|
||||
elif form.is_valid():
|
||||
form.save()
|
||||
post_id = request.POST['post']
|
||||
post = get_object_or_404(Post, id=post_id)
|
||||
messages.success(request, _("Reputation saved."))
|
||||
return HttpResponseRedirect(post.get_absolute_url())
|
||||
else:
|
||||
return render(request, 'djangobb_forum/reputation_form.html', {'form': form})
|
||||
|
@ -433,12 +455,14 @@ def edit_post(request, post_id):
|
|||
post = get_object_or_404(Post, pk=post_id)
|
||||
topic = post.topic
|
||||
if not forum_editable_by(post, request.user):
|
||||
messages.error(request, _("No permissions to edit this post."))
|
||||
return HttpResponseRedirect(post.get_absolute_url())
|
||||
form = build_form(EditPostForm, request, topic=topic, instance=post)
|
||||
if form.is_valid():
|
||||
post = form.save(commit=False)
|
||||
post.updated_by = request.user
|
||||
post.save()
|
||||
messages.success(request, _("Post updated."))
|
||||
return HttpResponseRedirect(post.get_absolute_url())
|
||||
|
||||
return render(request, 'djangobb_forum/edit_post.html', {'form': form,
|
||||
|
@ -460,6 +484,7 @@ def delete_posts(request, topic_id):
|
|||
deleted = True
|
||||
delete_post(request, post_id)
|
||||
if deleted:
|
||||
messages.success(request, _("Post deleted."))
|
||||
return HttpResponseRedirect(topic.get_absolute_url())
|
||||
|
||||
last_post = topic.posts.latest()
|
||||
|
@ -520,6 +545,7 @@ def move_topic(request):
|
|||
from_forum.topic_count = from_forum.topics.count()
|
||||
from_forum.post_count = from_forum.posts.count()
|
||||
from_forum.save()
|
||||
messages.success(request, _("Topic moved."))
|
||||
return HttpResponseRedirect(to_forum.get_absolute_url())
|
||||
|
||||
return render(request, 'djangobb_forum/move_topic.html', {'categories': Category.objects.all(),
|
||||
|
@ -531,12 +557,13 @@ def move_topic(request):
|
|||
@login_required
|
||||
@transaction.commit_on_success
|
||||
def stick_unstick_topic(request, topic_id, action):
|
||||
|
||||
topic = get_object_or_404(Topic, pk=topic_id)
|
||||
if forum_moderated_by(topic, request.user):
|
||||
if action == 's':
|
||||
topic.sticky = True
|
||||
messages.success(request, _("Topic marked as sticky."))
|
||||
elif action == 'u':
|
||||
messages.success(request, _("Sticky flag removed from topic."))
|
||||
topic.sticky = False
|
||||
topic.save()
|
||||
return HttpResponseRedirect(topic.get_absolute_url())
|
||||
|
@ -550,16 +577,14 @@ def delete_post(request, post_id):
|
|||
topic = post.topic
|
||||
forum = post.topic.forum
|
||||
|
||||
allowed = False
|
||||
if request.user.is_superuser or\
|
||||
if not (request.user.is_superuser or\
|
||||
request.user in post.topic.forum.moderators.all() or \
|
||||
(post.user == request.user and post == last_post):
|
||||
allowed = True
|
||||
|
||||
if not allowed:
|
||||
(post.user == request.user and post == last_post)):
|
||||
messages.success(request, _("You haven't the permission to delete this post."))
|
||||
return HttpResponseRedirect(post.get_absolute_url())
|
||||
|
||||
post.delete()
|
||||
messages.success(request, _("Post deleted."))
|
||||
|
||||
try:
|
||||
Topic.objects.get(pk=topic.id)
|
||||
|
@ -573,13 +598,14 @@ def delete_post(request, post_id):
|
|||
@login_required
|
||||
@transaction.commit_on_success
|
||||
def open_close_topic(request, topic_id, action):
|
||||
|
||||
topic = get_object_or_404(Topic, pk=topic_id)
|
||||
if forum_moderated_by(topic, request.user):
|
||||
if action == 'c':
|
||||
topic.closed = True
|
||||
messages.success(request, _("Topic closed."))
|
||||
elif action == 'o':
|
||||
topic.closed = False
|
||||
messages.success(request, _("Topic opened."))
|
||||
topic.save()
|
||||
return HttpResponseRedirect(topic.get_absolute_url())
|
||||
|
||||
|
@ -598,6 +624,7 @@ def users(request):
|
|||
def delete_subscription(request, topic_id):
|
||||
topic = get_object_or_404(Topic, pk=topic_id)
|
||||
topic.subscribers.remove(request.user)
|
||||
messages.info(request, _("Topic subscription removed."))
|
||||
if 'from_topic' in request.GET:
|
||||
return HttpResponseRedirect(reverse('djangobb:topic', args=[topic.id]))
|
||||
else:
|
||||
|
@ -609,6 +636,7 @@ def delete_subscription(request, topic_id):
|
|||
def add_subscription(request, topic_id):
|
||||
topic = get_object_or_404(Topic, pk=topic_id)
|
||||
topic.subscribers.add(request.user)
|
||||
messages.success(request, _("Topic subscribed."))
|
||||
return HttpResponseRedirect(reverse('djangobb:topic', args=[topic.id]))
|
||||
|
||||
|
||||
|
|
Reference in a new issue