better form handling in project_notification for webhook_form and email_form

Author: chirathr

readthedocs/projects/views/private.py

@@ -506,24 +506,25 @@ def project_notifications(request, project_slug):
     project = get_object_or_404(
         Project.objects.for_admin_user(request.user), slug=project_slug)
 
-    email_form = EmailHookForm(data=request.POST or None, project=project)
-    webhook_form = WebHookForm(data=request.POST or None, project=project)
+    project_dashboard = reverse('projects_notifications', args=[project.slug])
 
-    if request.method == 'POST':
-        if 'email' not in request.POST:
-            email_form = EmailHookForm(data=None, project=project)
-        if 'url' not in request.POST:
-            webhook_form = WebHookForm(data=None, project=project)
-        project_dashboard = reverse(
-            'projects_notifications',
-            args=[project.slug],
-        )
+    if request.method == 'POST' and 'email' in request.POST:
+        email_form = EmailHookForm(data=request.POST, project=project)
         if email_form.is_valid():
             email_form.save()
             return HttpResponseRedirect(project_dashboard)
+    else:
+        # Blank email_form if webhook_form is submitted or the request is GET
+        email_form = EmailHookForm(data=None, project=project)
+
+    if request.method == 'POST' and 'url' in request.POST:
+        webhook_form = WebHookForm(data=request.POST, project=project)
         if webhook_form.is_valid():
             webhook_form.save()
             return HttpResponseRedirect(project_dashboard)
+    else:
+        # Blank webhook_form if email_form is submitted or the request is GET
+        webhook_form = WebHookForm(data=None, project=project)
 
     emails = project.emailhook_notifications.all()
     urls = project.webhook_notifications.all()