Merge remote-tracking branch 'origin/refactor/rebus_new_mails' into refactor/rebus_new_mails

schoolapps/debug/migrations/0004_auto_20190916_1450.py

+# Generated by Django 2.2.4 on 2019-09-16 12:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('debug', '0003_auto_20190818_0910'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='debuglog',
+            name='filename',
+            field=models.FilePathField(blank=True, match='.*.log', path='/data/Silas/Daten/school-apps/schoolapps/latex', verbose_name='Dateiname zur Logdatei (falls nicht Log-Text)'),
+        ),
+    ]

schoolapps/faq/urls.py

@@ -4,4 +4,4 @@ from . import views
 urlpatterns = [
     path('', views.faq, name='faq'),
     path('ask', views.ask, name='ask-faq')
-]
\ No newline at end of file
+]

schoolapps/faq/views.py

-from django.shortcuts import render
+from django.shortcuts import render, redirect
+from django.contrib.auth.decorators import login_required
 from faq.models import FAQSection, FAQQuestion, Question
 from faq.forms import FAQForm
 
@@ -20,6 +21,7 @@ def faq(request):
     }
     return render(request, 'faq/faq.html', context)
 
+@login_required
 def ask(request):
     if request.method == 'POST':
         form = FAQForm(request.POST)
@@ -40,4 +42,4 @@ def ask(request):
     else:
         form = FAQForm()
 
-    return render(request, "faq/ask.html", {"form": form})
\ No newline at end of file
+    return render(request, "faq/ask.html", {"form": form})