Merge pull request #1376 from chris34/ikhaya-view-tests

Ikhaya view tests

inyoka/ikhaya/notifications.py

@@ -1,8 +1,8 @@
 """
-    inyoka.wiki.notifications
-    ~~~~~~~~~~~~~~~~~~~~~~~~~
+    inyoka.ikhaya.notifications
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    Utilities for wiki notifications.
+    Utilities for ikhaya notifications.
 
     :copyright: (c) 2007-2024 by the Inyoka Team, see AUTHORS for more details.
     :license: BSD, see LICENSE for more details.

inyoka/ikhaya/views.py

@@ -19,6 +19,7 @@
 from django.http import Http404, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, render
 from django.template.loader import render_to_string
+from django.utils import timezone as dj_timezone
 from django.utils.dates import MONTHS
 from django.utils.html import escape
 from django.utils.timezone import get_current_timezone
@@ -198,34 +199,24 @@ def detail(request, year, month, day, slug):
         if 'preview' in request.POST:
             preview = Comment.get_text_rendered(request.POST.get('text', ''))
         elif form.is_valid():
-            send_subscribe = False
             data = form.cleaned_data
-            if data.get('comment_id') and request.user.has_perm('ikhaya.change_comment'):
-                c = Comment.objects.get(id=data['comment_id'])
-                c.text = data['text']
-                messages.success(request, _('The comment was edited '
-                                            'successfully.'))
-            else:
-                send_subscribe = True
-                c = Comment(text=data['text'])
-                c.article = article
-                c.author = request.user
-                c.pub_date = datetime.utcnow()
-                messages.success(request, _('Your comment was created.'))
+
+            c = Comment(text=data['text'],
+                        article=article,
+                        author=request.user,
+                        pub_date=dj_timezone.now(),
+                        )
             c.save()
-            if send_subscribe:
-                # Send a message to users who subscribed to the article
-                send_comment_notifications(request.user.pk, c.pk, article.pk)
+
+            messages.success(request, _('Your comment was created.'))
+
+            # Send a message to users who subscribed to the article
+            send_comment_notifications(request.user.pk, c.pk, article.pk)
 
             return HttpResponseRedirect(url_for(c))
-    elif request.GET.get('moderate'):
-        comment = Comment.objects.get(id=int(request.GET.get('moderate')))
-        form = EditCommentForm(initial={
-            'comment_id': comment.id,
-            'text': comment.text,
-        })
     else:
         form = EditCommentForm()
+
     return {
         'article': article,
         'comments': article.comment_set.select_related('author'),
@@ -618,16 +609,13 @@ def suggest_delete(request, suggestion):
                 messages.error(request, (_('This suggestion does not exist.')))
                 return HttpResponseRedirect(href('ikhaya', 'suggestions'))
             if request.POST.get('note'):
-                args = {'title': s.title,
-                        'username': request.user.username,
-                        'note': request.POST['note']}
-                send_notification(s.author, 'suggestion_rejected',
-                    _('Article suggestion deleted'), args)
-
                 # Send the user a private message
                 msg = PrivateMessage()
                 msg.author = request.user
-                msg.subject = _('Article suggestion deleted')
+                msg.subject = _('Article suggestion rejected')
+                args = {'title': s.title,
+                        'username': request.user.username,
+                        'note': request.POST['note']}
                 msg.text = render_to_string('mails/suggestion_rejected.txt', args)
                 msg.pub_date = datetime.utcnow()
                 recipients = [s.author]
@@ -790,11 +778,13 @@ def event_edit(request, pk=None):
             event = Event()
         try:
             base_event = Event.objects.get(pk=int(request.GET['copy_from']))
+        except ValueError:
+            messages.error(request, _('Parameter "copy_from" is not a number.'))
         except Event.DoesNotExist:
             messages.error(request,
                 _('The event with the id %(id)s could not be used as draft '
                   'for a new event because it does not exist.')
-                % {'id': request.GET['copy_from']})
+                % {'id': escape(request.GET['copy_from'])})
         else:
             fields = ('name', 'changed', 'created', 'date', 'time',
                       'enddate', 'endtime', 'description', 'author_id',