Skip to content

Commit bfd074b

Browse files
authored
Merge pull request #12 from kwangsooshin/feature/urls
Edit: URL regex patterns
2 parents 99629b6 + 69f6f48 commit bfd074b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

log_viewer/urls.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
if django.VERSION >= (2, 0):
1111
from django.urls import re_path
1212
urlpatterns = [
13-
re_path(r'^json/(?P<file_name>[\.\w-]*)/(?P<page>[0-9]+)', log_json, name='log_json_view'),
14-
re_path(r'^json/(?P<file_name>[\.\w-]*)', log_json, name='log_json_view'),
15-
re_path(r'^', log_viewer, name='log_file_view'),
13+
re_path(r'^json/(?P<file_name>[\.\w-]*)/(?P<page>[0-9]+)/?$', log_json, name='log_json_view'),
14+
re_path(r'^json/(?P<file_name>[\.\w-]*)/?$', log_json, name='log_json_view'),
15+
re_path(r'^/?$', log_viewer, name='log_file_view'),
1616
]
1717
else:
1818
from django.conf.urls import url
1919
urlpatterns = [
20-
url(r'^json/(?P<file_name>[\.\w-]*)/(?P<page>[0-9]+)', log_json, name='log_json_view'),
21-
url(r'^json/(?P<file_name>[\.\w-]*)', log_json, name='log_json_view'),
22-
url(r'^', log_viewer, name='log_file_view'),
20+
url(r'^json/(?P<file_name>[\.\w-]*)/(?P<page>[0-9]+)/?$', log_json, name='log_json_view'),
21+
url(r'^json/(?P<file_name>[\.\w-]*)/?$', log_json, name='log_json_view'),
22+
url(r'^/?$', log_viewer, name='log_file_view'),
2323
]

0 commit comments

Comments
 (0)