Merge branch 'master' of https://git.eleves.ens.fr/cof-geek/gestioCOF into Aufinal/bda_revente

cof/routing.py

@@ -0,0 +1,3 @@
+from kfet.routing import channel_routing as kfet_channel_routings
+
+channel_routing = kfet_channel_routings

cof/settings_dev.py

@@ -50,6 +50,9 @@ INSTALLED_APPS = (
     'django_cas_ng',
     'debug_toolbar',
     'bootstrapform',
+    'kfet',
+    'channels',
+    'widget_tweaks',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -58,6 +61,7 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
+    'kfet.middleware.KFetAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.security.SecurityMiddleware',
@@ -80,6 +84,7 @@ TEMPLATES = [
                 'django.core.context_processors.media',
                 'django.core.context_processors.static',
                 'gestioncof.shared.context_processor',
+                'kfet.context_processors.auth',
             ],
         },
     },
@@ -87,7 +92,6 @@ TEMPLATES = [
 
 # WSGI_APPLICATION = 'cof.wsgi.application'
 
-
 # Database
 # https://docs.djangoproject.com/en/1.8/ref/settings/#databases
 
@@ -120,6 +124,10 @@ USE_TZ = True
 
 STATIC_URL = '/static/'
 
+STATICFILES_DIRS = (
+  os.path.join(BASE_DIR, 'static/'),
+)
+
 # Media upload (through ImageField, SiteField)
 # https://docs.djangoproject.com/en/1.9/ref/models/fields/
 
@@ -164,6 +172,17 @@ RECAPTCHA_PUBLIC_KEY = "DUMMY"
 RECAPTCHA_PRIVATE_KEY = "DUMMY"
 RECAPTCHA_USE_SSL = True
 
+# Channels settings
+
+CHANNEL_LAYERS = {
+    "default": {
+        "BACKEND": "asgi_redis.RedisChannelLayer",
+        "CONFIG": {
+            "hosts": [("redis://:password_redis@127.0.0.1:6379/0")],
+        },
+        "ROUTING": "cof.routing.channel_routing",
+    }
+}
 
 def show_toolbar(request):
     """

cof/urls.py

@@ -81,6 +81,7 @@ urlpatterns = [
     url(r'^utile_bda/bda_diff$', gestioncof_views.liste_bdadiff),
     url(r'^utile_cof/diff_cof$', gestioncof_views.liste_diffcof),
     url(r'^utile_bda/bda_revente$', gestioncof_views.liste_bdarevente),
+    url(r'^k-fet/', include('kfet.urls'))
 ] + \
     (static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
      if settings.DEBUG