Fixed bug which prevented reciepient selection

d120 · May 30, 2017 · 690fa53 · 690fa53
1 parent f58ffdb
commit 690fa53
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/src/feedback/views/intern/__init__.py b/src/feedback/views/intern/__init__.py
@@ -338,16 +338,7 @@ def sendmail(request):
     data['tutoren_choices'] = tutoren_choices
 
     if request.method == 'POST':
-        if 'uebernehmen' in request.POST:
-            try:
-                vorlage = Mailvorlage.objects.get(id=int(request.POST['vorlage']))
-                data['subject'] = vorlage.subject
-                data['body'] = vorlage.body
-            except (Mailvorlage.DoesNotExist, KeyError, ValueError):
-                return HttpResponseRedirect(reverse('sendmail'))
-            return render(request, 'intern/sendmail.html', data)
-
-
+
         try:
             semester = Semester.objects.get(semester=request.POST['semester'])
             data['subject'] = request.POST['subject']
@@ -359,18 +350,29 @@ def sendmail(request):
                 data['recipient_selected'] = data['recipient']
             elif 'status_values' in request.POST.keys():
                 data['recipient'] = ast.literal_eval(request.POST.get('status_values'))
-            else:
+            elif 'uebernehmen' not in request.POST:
                 return HttpResponseRedirect(reverse('sendmail'))
 
         except (Semester.DoesNotExist, KeyError):
             return HttpResponseRedirect(reverse('sendmail'))
 
         data['semester_selected'] = semester
         data['subject_rendered'] = "Evaluation: %s" % data['subject']
+
+        if 'uebernehmen' in request.POST:
+            try:
+                vorlage = Mailvorlage.objects.get(id=int(request.POST['vorlage']))
+                data['subject'] = vorlage.subject
+                data['body'] = vorlage.body
+
+            except (Mailvorlage.DoesNotExist, KeyError, ValueError):
+                return HttpResponseRedirect(reverse('sendmail'))
+            return render(request, 'intern/sendmail.html', data)
 
         veranstaltungen = get_relevant_veranstaltungen(data['recipient'], semester)
         demo_context, link_suffix_format, link_veranstalter = get_demo_context(request)
 
+
         if 'vorschau' in request.POST:
             data['vorschau'] = True
             data['from'] = settings.DEFAULT_FROM_EMAIL