You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2020/11/19 01:14:17 UTC

[airavata-django-portal] branch develop updated: AIRAVATA-3376 add format suffixes to manually created patterns

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git


The following commit(s) were added to refs/heads/develop by this push:
     new fa26c68  AIRAVATA-3376 add format suffixes to manually created patterns
fa26c68 is described below

commit fa26c681bf83a7aa78abd7710df1fcdb33f6e59c
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Nov 18 20:12:37 2020 -0500

    AIRAVATA-3376 add format suffixes to manually created patterns
    
    URL reversing now requires that kwargs exist in the url pattern being matched.
    DRF automatically adds 'format' to the kwargs so need it in the pattern to match.
---
 django_airavata/apps/api/urls.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/django_airavata/apps/api/urls.py b/django_airavata/apps/api/urls.py
index 0a602ab..9295a32 100644
--- a/django_airavata/apps/api/urls.py
+++ b/django_airavata/apps/api/urls.py
@@ -1,7 +1,8 @@
 import logging
 
-from django.conf.urls import include, url
+from django.conf.urls import url
 from rest_framework import routers
+from rest_framework.urlpatterns import format_suffix_patterns
 
 from . import views
 
@@ -50,7 +51,6 @@ router.register(r'unverified-email-users', views.UnverifiedEmailUserViewSet,
 
 app_name = 'django_airavata_api'
 urlpatterns = [
-    url(r'^', include(router.urls)),
     url(r'^upload$', views.upload_input_file, name='upload_input_file'),
     url(r'^tus-upload-finish$', views.tus_upload_finish,
         name='tus_upload_finish'),
@@ -107,6 +107,8 @@ urlpatterns = [
         views.link_output_view, name="link-output"),
 ]
 
+urlpatterns = router.urls + format_suffix_patterns(urlpatterns)
+
 if logger.isEnabledFor(logging.DEBUG):
     for router_url in router.urls:
         logger.debug("router url: {}".format(router_url))