From 2bfbb9d0bf33cf3303623d5cc96e4e161c761e6e Mon Sep 17 00:00:00 2001 From: Gideon Thomas Date: Fri, 26 Jan 2018 10:16:11 -0500 Subject: [PATCH 1/4] Test commit --- network-api/networkapi/fellows/views.py | 1 + 1 file changed, 1 insertion(+) diff --git a/network-api/networkapi/fellows/views.py b/network-api/networkapi/fellows/views.py index e0457f73b87..6e30fceb5ae 100644 --- a/network-api/networkapi/fellows/views.py +++ b/network-api/networkapi/fellows/views.py @@ -3,6 +3,7 @@ # Create your views here. def fellows_home(request): + print('Rendering Fellows Home') return render(request, 'fellows_home.html') From 73e9fcba39c91c62533f0206ec2210a461044de7 Mon Sep 17 00:00:00 2001 From: Gideon Thomas Date: Fri, 26 Jan 2018 10:36:43 -0500 Subject: [PATCH 2/4] Find out which url is it resolving to --- network-api/networkapi/settings.py | 1 + requirements.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/network-api/networkapi/settings.py b/network-api/networkapi/settings.py index ef6416122d5..cdd83ca3ac2 100644 --- a/network-api/networkapi/settings.py +++ b/network-api/networkapi/settings.py @@ -118,6 +118,7 @@ 'mezzanine.pages', 'mezzanine.forms', + 'django_extensions', 'whitenoise.runserver_nostatic', 'rest_framework', 'django_filters', diff --git a/requirements.txt b/requirements.txt index bdfbf1f0941..af37a735160 100644 --- a/requirements.txt +++ b/requirements.txt @@ -49,3 +49,5 @@ factory_boy==2.9.2 faker==0.8.10 coverage==4.4.2 python-coveralls==2.9.1 + +django-extensions==1.9.9 From c765ac0a77db7cee1d10ccdfe9d8529ea77e080f Mon Sep 17 00:00:00 2001 From: Gideon Thomas Date: Fri, 26 Jan 2018 10:47:27 -0500 Subject: [PATCH 3/4] Fix stuff --- network-api/networkapi/fellows/views.py | 1 - network-api/networkapi/urls.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/network-api/networkapi/fellows/views.py b/network-api/networkapi/fellows/views.py index 6e30fceb5ae..e0457f73b87 100644 --- a/network-api/networkapi/fellows/views.py +++ b/network-api/networkapi/fellows/views.py @@ -3,7 +3,6 @@ # Create your views here. def fellows_home(request): - print('Rendering Fellows Home') return render(request, 'fellows_home.html') diff --git a/network-api/networkapi/urls.py b/network-api/networkapi/urls.py index f134809b299..72c33a28ef6 100644 --- a/network-api/networkapi/urls.py +++ b/network-api/networkapi/urls.py @@ -27,9 +27,9 @@ urlpatterns = list(filter(None, [ url(r'^admin/', include(admin.site.urls)), - url(r'^soc/', include('social_django.urls', namespace='social')), - url(r'^fellowships/', include('networkapi.fellows.urls')) + url(r'^soc/', include('social_django.urls', namespace='social')) if settings.SOCIAL_SIGNIN else '', + url(r'^fellowships/', include('networkapi.fellows.urls')), # network-api routes: url(r'^api/people/', include('networkapi.people.urls')), url(r'^api/news/', include('networkapi.news.urls')), From f03fb4e9a725fb6fee75aac54886ede13d2f2e76 Mon Sep 17 00:00:00 2001 From: Gideon Thomas Date: Fri, 26 Jan 2018 10:48:40 -0500 Subject: [PATCH 4/4] Remove debugging stuff --- network-api/networkapi/settings.py | 1 - requirements.txt | 2 -- 2 files changed, 3 deletions(-) diff --git a/network-api/networkapi/settings.py b/network-api/networkapi/settings.py index cdd83ca3ac2..ef6416122d5 100644 --- a/network-api/networkapi/settings.py +++ b/network-api/networkapi/settings.py @@ -118,7 +118,6 @@ 'mezzanine.pages', 'mezzanine.forms', - 'django_extensions', 'whitenoise.runserver_nostatic', 'rest_framework', 'django_filters', diff --git a/requirements.txt b/requirements.txt index af37a735160..bdfbf1f0941 100644 --- a/requirements.txt +++ b/requirements.txt @@ -49,5 +49,3 @@ factory_boy==2.9.2 faker==0.8.10 coverage==4.4.2 python-coveralls==2.9.1 - -django-extensions==1.9.9