Conjunto de cambios 38840b5 en gestor_consulta para gestor_consulta/settings.py

Fecha y hora:

19/09/2017 15:13:25 (hace 7 años)

Autor:

Antonio Araujo <aaraujo@…>

Branches:

master

Children:

4400fb8

Parents:

d45fcdc (diferencia), 9b33f35 (diferencia)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Mensaje:

Corrección de conflictos en archivos settings.py y urls.py

Fichero:

• gestor_consulta/settings.py (modificado) (1 diferencia)

gestor_consulta/settings.py

@@ -158 +158 @@
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
+## Configuraciones del rest framework
 REST_FRAMEWORK = {
-    'DEFAULT_FILTER_BACKENDS': ('django_filters.rest_framework.DjangoFilterBackend',),
-    # taken from http://getblimp.github.io/django-rest-framework-jwt/ to test JWT
+    'DEFAULT_FILTER_BACKENDS': (
+        'django_filters.rest_framework.DjangoFilterBackend',
+    ),
+    'DEFAULT_PERMISSION_CLASSES': (
+        'rest_framework.permissions.IsAuthenticated',
+    ),
     'DEFAULT_AUTHENTICATION_CLASSES': (
+        'rest_framework.authentication.SessionAuthentication',
         'rest_framework_jwt.authentication.JSONWebTokenAuthentication',
-        'rest_framework.authentication.SessionAuthentication',
-        'rest_framework.authentication.BasicAuthentication',
+
     ),
 }