From 896ee8724f8c31a6959151eeb3efa0b8060913aa Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Wed, 13 Jan 2016 10:37:33 +0000 Subject: [PATCH] Fixed process management command --- api/urls.py | 9 ++++----- dss/settings.py | 8 ++++++++ spa/management/commands/azure_util.py | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/api/urls.py b/api/urls.py index cb0bbb6..2b8eeba 100755 --- a/api/urls.py +++ b/api/urls.py @@ -1,20 +1,17 @@ from django.conf.urls import patterns, url, include -from rest_framework import permissions from rest_framework.permissions import IsAuthenticated +from rest_framework.response import Response from rest_framework.routers import DefaultRouter from rest_framework.views import APIView +from rest_framework.views import status from rest_framework_jwt.authentication import JSONWebTokenAuthentication from api import views, auth, helpers from api.auth import SocialLoginHandler -from rest_framework.views import status -from rest_framework.response import Response from core.realtime import activity router = DefaultRouter() # trailing_slash=True) -router.register(r'user', views.UserProfileViewSet) -router.register(r'mix', views.MixViewSet) router.register(r'notification', views.NotificationViewSet) router.register(r'hitlist', views.HitlistViewSet) @@ -26,6 +23,8 @@ router.register(r'shows', views.ShowViewSet, base_name='shows') router.register(r'blog', views.BlogViewSet, base_name='shows') router.register(r'playlist', views.PlaylistViewSet, base_name='playlists') +router.register(r'user', views.UserProfileViewSet) +router.register(r'mix', views.MixViewSet) class DebugView(APIView): permission_classes = (IsAuthenticated,) diff --git a/dss/settings.py b/dss/settings.py index 28f8fd4..41cf3cc 100755 --- a/dss/settings.py +++ b/dss/settings.py @@ -240,3 +240,11 @@ CORS_ALLOW_HEADERS = ( ) """ End static settings """ +SOCIAL_AUTH_AUTHENTICATION_BACKENDS = ( + 'social.backends.open_id.OpenIdAuth', + 'social.backends.google.GoogleOpenId', + 'social.backends.google.GoogleOAuth2', + 'social.backends.google.GoogleOAuth', + 'social.backends.twitter.TwitterOAuth', + 'social.backends.yahoo.YahooOpenId' +) diff --git a/spa/management/commands/azure_util.py b/spa/management/commands/azure_util.py index 25a0f42..71f466a 100755 --- a/spa/management/commands/azure_util.py +++ b/spa/management/commands/azure_util.py @@ -7,7 +7,7 @@ from spa.models.mix import Mix def _update_azure_headers(): - ms = Mix.objects.filter(slug='september-2015') + ms = Mix.objects.all() for m in ms: print("Update headers for {0}".format(m.title)) cdn.set_azure_details(