From bfa6c215172d00dd1884fd25b96d073e7b832588 Mon Sep 17 00:00:00 2001 From: William Moore Date: Wed, 3 May 2023 11:34:18 +0100 Subject: [PATCH 1/2] urls.py uses re_path --- omero_parade/urls.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/omero_parade/urls.py b/omero_parade/urls.py index a955e0f9..c674a429 100644 --- a/omero_parade/urls.py +++ b/omero_parade/urls.py @@ -17,35 +17,35 @@ """Django urls.""" -from django.conf.urls import url +from django.urls import re_path from . import views urlpatterns = [ # Home page - url(r'^$', views.index, name="parade_index"), + re_path(r'^$', views.index, name="parade_index"), # GET search results. Use ?query=foo - url(r'^search/$', views.search, name='parade_search'), + re_path(r'^search/$', views.search, name='parade_search'), # list fields in Plate ?plate=123 or Acquisition ?run=456 - url(r'^api/fields/$', views.api_field_list, name='parade_fields'), + re_path(r'^api/fields/$', views.api_field_list, name='parade_fields'), # list functions for filtering data - # url(r'^api/filters/$', views.api_filter_list, name='parade_filters'), - url(r'^filters/$', views.filter_list, name='parade_filters'), + # re_path(r'^api/filters/$', views.api_filter_list, name='parade_filters'), + re_path(r'^filters/$', views.filter_list, name='parade_filters'), # Get the script - need to also include current data to be filtered # e.g. ?plate=1 - url(r'^filters/script/(?P[\w.]+)/$', views.filter_script, + re_path(r'^filters/script/(?P[\w.]+)/$', views.filter_script, name='parade_filter_script'), # list sources of table data - url(r'^dataproviders/$', views.dataprovider_list, + re_path(r'^dataproviders/$', views.dataprovider_list, name='parade_dataproviders'), # Get the table data - url(r'^data/(?P[\w+\/=]+)/$', views.get_data, + re_path(r'^data/(?P[\w+\/=]+)/$', views.get_data, name='parade_data'), ] From ac828c4e9448ae02901d3972621442bf070b3b73 Mon Sep 17 00:00:00 2001 From: William Moore Date: Wed, 3 May 2023 11:48:23 +0100 Subject: [PATCH 2/2] Fix indents --- omero_parade/urls.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/omero_parade/urls.py b/omero_parade/urls.py index c674a429..c7c6ce25 100644 --- a/omero_parade/urls.py +++ b/omero_parade/urls.py @@ -39,13 +39,13 @@ # Get the script - need to also include current data to be filtered # e.g. ?plate=1 re_path(r'^filters/script/(?P[\w.]+)/$', views.filter_script, - name='parade_filter_script'), + name='parade_filter_script'), # list sources of table data re_path(r'^dataproviders/$', views.dataprovider_list, - name='parade_dataproviders'), + name='parade_dataproviders'), # Get the table data re_path(r'^data/(?P[\w+\/=]+)/$', views.get_data, - name='parade_data'), + name='parade_data'), ]