Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes Figures URL wildcard placement #284

Merged
merged 1 commit into from
Nov 18, 2020
Merged

Conversation

johnbaldwin
Copy link
Contributor

The issue was that the router URLs were included after the wildcard url
pattern. This should fix the issue

The issue was that the router URLs were included after the wildcard url
pattern. This should fix the issue
@@ -139,3 +139,5 @@
urlpatterns.append(url(r'^api/', include(router.urls, namespace='api')))
else:
urlpatterns.append(url(r'^api/', include((router.urls, 'api'), namespace='api')))

urlpatterns.append(url(r'^(?:.*)/?$', views.figures_home, name='router-catch-all'))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
urlpatterns.append(url(r'^(?:.*)/?$', views.figures_home, name='router-catch-all'))
# Reroute all unmatched traffic to Figures main UI page
urlpatterns.append(url(r'^(?:.*)/?$', views.figures_home, name='router-catch-all'))

figures/urls.py Outdated
@@ -129,7 +129,7 @@
name='general-site-metrics'),

# Reroute all unmatched traffic to Figures main UI page
url(r'^(?:.*)/?$', views.figures_home, name='router-catch-all')
# url(r'^(?:.*)/?$', views.figures_home, name='router-catch-all')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# url(r'^(?:.*)/?$', views.figures_home, name='router-catch-all')

figures/urls.py Outdated
@@ -129,7 +129,7 @@
name='general-site-metrics'),

# Reroute all unmatched traffic to Figures main UI page
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# Reroute all unmatched traffic to Figures main UI page

@johnbaldwin johnbaldwin force-pushed the john/fix-url-wildcard branch from 1554552 to f72fe2e Compare November 18, 2020 12:25
@johnbaldwin
Copy link
Contributor Author

Thanks, Omar!

Copy link
Contributor

@melvinsoft melvinsoft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@johnbaldwin Except Omar's comments, it looks good to me.

@johnbaldwin johnbaldwin merged commit 4488f21 into master Nov 18, 2020
@johnbaldwin johnbaldwin deleted the john/fix-url-wildcard branch November 18, 2020 14:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants