Make docs comment suggestions do a redirect

This is the same as b2ed4946551c098079d1a156b222d4ebf5c85cba did for bug
reports.

This changes the regexps for all the doc comment suggestions forms to be
a little bit more specific than before.

diff --git a/pgweb/account/urls.py b/pgweb/account/urls.py
index 293836de636d6735e0e07025d933fc0ede7c992b..2a6f57e4ef59d20de8619880d79f96915e35f6d6 100644 (file)
--- a/pgweb/account/urls.py
+++ b/pgweb/account/urls.py
@@ -37,7 +37,8 @@ urlpatterns = [
     url(r'^services/(.*)/$', pgweb.profserv.views.profservform),
 
     # Docs comments
-    url(r'^comments/(new)/(.*)/(.*)/$', pgweb.docs.views.commentform),
+    url(r'^comments/(new)/([^/]+)/([^/]+)/$', pgweb.docs.views.commentform),
+    url(r'^comments/(new)/([^/]+)/([^/]+)/done/$', pgweb.docs.views.commentform_done),
 
     # Log in, logout, change password etc
     url(r'^login/$', pgweb.account.views.login),

diff --git a/pgweb/docs/views.py b/pgweb/docs/views.py
index db1ae5e0f367e4619deb082903ea8a409e7bca8f..4577f0ce0e37f9503ad216d3011e0cc0dd4b4ade 100644 (file)
--- a/pgweb/docs/views.py
+++ b/pgweb/docs/views.py
@@ -171,7 +171,7 @@ def commentform(request, itemid, version, filename):
                 replyto='%s, %s' % (form.cleaned_data['email'], settings.DOCSREPORT_EMAIL),
                 sendername='PG Doc comments form'
             )
-            return render_pgweb(request, 'docs', 'docs/docsbug_completed.html', {})
+            return HttpResponseRedirect("done/")
     else:
         form = DocCommentForm(initial={
             'name': '%s %s' % (request.user.first_name, request.user.last_name),
@@ -187,3 +187,8 @@ def commentform(request, itemid, version, filename):
         }),
         'savebutton': 'Send Email',
     })
+
+
+@login_required
+def commentform_done(request, itemid, version, filename):
+    return render_pgweb(request, 'docs', 'docs/docsbug_completed.html', {})