diff --git a/rowers/views/statements.py b/rowers/views/statements.py index f6b576c0..4a36f355 100644 --- a/rowers/views/statements.py +++ b/rowers/views/statements.py @@ -472,7 +472,7 @@ from rowers.interactiveplots import * from rowers.celery import result as celery_result # Define the API documentation -#schema_view = get_swagger_view(title='Rowsandall API') +schema_view = get_swagger_view(title='Rowsandall API') def remove_asynctask(request,id): try: diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index 19d215d1..6f6dadef 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -378,8 +378,8 @@ REST_FRAMEWORK = { 'DEFAULT_AUTHENTICATION_CLASSES': ( 'rest_framework.authentication.BasicAuthentication', 'rest_framework.authentication.SessionAuthentication', -# 'oauth2_provider.ext.rest_framework.OAuth2Authentication', - 'oauth2_provider.contrib.rest_framework.OAuth2Authentication', + 'oauth2_provider.ext.rest_framework.OAuth2Authentication', +# 'oauth2_provider.contrib.rest_framework.OAuth2Authentication', ), 'PAGE_SIZE': 20, 'DEFAULT_PAGINATION_CLASS':'rest_framework.pagination.LimitOffsetPagination', diff --git a/rowsandall_app/urls.py b/rowsandall_app/urls.py index ce2714fa..faf415b7 100644 --- a/rowsandall_app/urls.py +++ b/rowsandall_app/urls.py @@ -35,26 +35,26 @@ handler500 = 'rowers.views.error500_view' urlpatterns = [ url('^', include('django.contrib.auth.urls')), url(r'^django-rq/',include('django_rq.urls')), -# url(r'^password_change_done/$',auth_views.password_change_done,name='password_change_done'), - url(r'^password_change_done/$',auth_views.PasswordChangeDoneView,name='password_change_done'), -# url(r'^password_change/$',auth_views.password_change), - url(r'^password_change/$',auth_views.PasswordChangeView,name='password_change'), + url(r'^password_change_done/$',auth_views.password_change_done,name='password_change_done'), +# url(r'^password_change_done/$',auth_views.PasswordChangeDoneView,name='password_change_done'), + url(r'^password_change/$',auth_views.password_change), +# url(r'^password_change/$',auth_views.PasswordChangeView,name='password_change'), url(r'^password_reset/$', -# auth_views.password_reset, - auth_views.PasswordResetView, + auth_views.password_reset, +# auth_views.PasswordResetView, {'template_name': 'rowers/templates/registration/password_reset.html'}, name='password_reset'), url(r'^password_reset/done/$', -# auth_views.password_reset_done, - auth_views.PasswordResetDoneView, + auth_views.password_reset_done, +# auth_views.PasswordResetDoneView, name='password_reset_done'), url(r'^reset/(?P[0-9A-Za-z_\-]+)/(?P.+)/$', -# auth_views.password_reset_confirm, - auth_views.PasswordResetConfirmView, + auth_views.password_reset_confirm, +# auth_views.PasswordResetConfirmView, name='password_reset_confirm'), url(r'^reset/done/$', -# auth_views.password_reset_complete, - auth_views.PasswordResetCompleteView, + auth_views.password_reset_complete, +# auth_views.PasswordResetCompleteView, name='password_reset_complete'), ] @@ -66,17 +66,17 @@ urlpatterns += [ url(r'^$',rootview), url(r'^getblogs/$',rowersviews.get_blog_posts), url(r'^login/', -# auth_views.login, - auth_views.LoginView, + auth_views.login, +# auth_views.LoginView, name='login'), url(r'^logout/$', -# auth_views.logout, - auth_views.LogoutView, + auth_views.logout, +# auth_views.LogoutView, {'next_page': '/'}, name='logout',), url(r'^rowers/',include('rowers.urls')), # url(r'^cvkbrno/',include('cvkbrno.urls')), -# url(r'^admin/rq/',include('django_rq_dashboard.urls')), + url(r'^admin/rq/',include('django_rq_dashboard.urls')), url(r'^call\_back',rowersviews.rower_process_callback), url(r'^stravacall\_back',rowersviews.rower_process_stravacallback), url(r'^sporttracks\_callback',rowersviews.rower_process_sporttrackscallback),