Merge branch 'master' into Kerl/use_django_custommail

gestioncof/petits_cours_views.py

@@ -140,9 +140,7 @@ def _finalize_traitement(request, demande, proposals, proposed_for,
                    "proposed_for": proposed_for,
                    "proposed_mails": proposed_mails,
                    "mainmail": mainmail,
-                   "attribdata":
-                   base64.b64encode(json.dumps(attribdata)
-                                    .encode('utf_8')),
+                   "attribdata": json.dumps(attribdata),
                    "redo": redo,
                    "errors": errors,
                    })
@@ -254,7 +252,7 @@ def _traitement_post(request, demande):
     extra = request.POST["extra"].strip()
     redo = "redo" in request.POST
     attribdata = request.POST["attribdata"]
-    attribdata = dict(json.loads(base64.b64decode(attribdata)))
+    attribdata = dict(json.loads(attribdata))
     for matiere in demande.matieres.all():
         if matiere.id not in attribdata:
             unsatisfied.append(matiere)

kfet/migrations/0047_auto_20170104_1528.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('kfet', '0046_account_created_at'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='account',
+            name='promo',
+            field=models.IntegerField(blank=True, choices=[(1980, 1980), (1981, 1981), (1982, 1982), (1983, 1983), (1984, 1984), (1985, 1985), (1986, 1986), (1987, 1987), (1988, 1988), (1989, 1989), (1990, 1990), (1991, 1991), (1992, 1992), (1993, 1993), (1994, 1994), (1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017)], default=2016, null=True),
+        ),
+    ]

kfet/routing.py

@@ -8,5 +8,5 @@ from channels.routing import route, route_class
 from kfet import consumers
 
 channel_routing = [
-    route_class(consumers.KPsul, path=r"^ws/k-fet/k-psul/$"),
+    route_class(consumers.KPsul, path=r"^/ws/k-fet/k-psul/$"),
 ]

provisioning/apache.conf

@@ -10,7 +10,7 @@
 	# place des lignes suivantes:
 	#
 	# RequestHeader set Daphne-Root-Path /gestion
-	# ProxyPass /gestion/ws/ ws://127.0.0.1:8001/gestion/ws/
+	# ProxyPass /gestion/ws/ ws://127.0.0.1:8001/ws/
 	# ProxyPass /gestion http://127.0.0.1:8001/gestion
 	# ProxyPassReverse /gestion http://127.0.0.1:8001/gestion
 	#