Merge pull request #12 from kwangsooshin/feature/urls

Edit: URL regex patterns
agusmakmun · Aug 31, 2020 · bfd074b · bfd074b
2 parents 99629b6 + 69f6f48
commit bfd074b
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/log_viewer/urls.py b/log_viewer/urls.py
@@ -10,14 +10,14 @@
 if django.VERSION >= (2, 0):
     from django.urls import re_path
     urlpatterns = [
-        re_path(r'^json/(?P<file_name>[\.\w-]*)/(?P<page>[0-9]+)', log_json, name='log_json_view'),
-        re_path(r'^json/(?P<file_name>[\.\w-]*)', log_json, name='log_json_view'),
-        re_path(r'^', log_viewer, name='log_file_view'),
+        re_path(r'^json/(?P<file_name>[\.\w-]*)/(?P<page>[0-9]+)/?$', log_json, name='log_json_view'),
+        re_path(r'^json/(?P<file_name>[\.\w-]*)/?$', log_json, name='log_json_view'),
+        re_path(r'^/?$', log_viewer, name='log_file_view'),
     ]
 else:
     from django.conf.urls import url
     urlpatterns = [
-        url(r'^json/(?P<file_name>[\.\w-]*)/(?P<page>[0-9]+)', log_json, name='log_json_view'),
-        url(r'^json/(?P<file_name>[\.\w-]*)', log_json, name='log_json_view'),
-        url(r'^', log_viewer, name='log_file_view'),
+        url(r'^json/(?P<file_name>[\.\w-]*)/(?P<page>[0-9]+)/?$', log_json, name='log_json_view'),
+        url(r'^json/(?P<file_name>[\.\w-]*)/?$', log_json, name='log_json_view'),
+        url(r'^/?$', log_viewer, name='log_file_view'),
     ]