Skip to content

Commit 485caaf

Browse files
JelteFmhagander
authored andcommitted
Redirect /open fully
Now it forwards everything after the slash so that links like the following work: /open/new/ /open?author=-3
1 parent f668449 commit 485caaf

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

pgcommitfest/commitfest/views.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def activity(request, cfid=None, rss=None):
8181
})
8282

8383

84-
def redir(request, what):
84+
def redir(request, what, end):
8585
if what == 'open':
8686
cfs = list(CommitFest.objects.filter(status=CommitFest.STATUS_OPEN))
8787
elif what == 'inprogress':
@@ -96,7 +96,10 @@ def redir(request, what):
9696
messages.warning(request, "More than one {0} commitfest exists, redirecting to startpage instead.".format(what))
9797
return HttpResponseRedirect("/")
9898

99-
return HttpResponseRedirect("/%s/" % cfs[0].id)
99+
query_string = request.GET.urlencode()
100+
if query_string:
101+
query_string = '?' + query_string
102+
return HttpResponseRedirect(f"/{cfs[0].id}/{end}{query_string}")
100103

101104

102105
def commitfest(request, cfid):

pgcommitfest/urls.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
re_path(r'^$', views.home),
1818
re_path(r'^activity(?P<rss>\.rss)?/', views.activity),
1919
re_path(r'^(\d+)/$', views.commitfest),
20-
re_path(r'^(open|inprogress)/$', views.redir),
20+
re_path(r'^(open|inprogress)/(.*)$', views.redir),
2121
re_path(r'^(?P<cfid>\d+)/activity(?P<rss>\.rss)?/$', views.activity),
2222
re_path(r'^(\d+)/(\d+)/$', views.patch),
2323
re_path(r'^(\d+)/(\d+)/edit/$', views.patchform),

0 commit comments

Comments
 (0)