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

gestioncof/autocomplete.py

@@ -10,8 +10,10 @@ from django.db.models import Q
 
 from django.contrib.auth.models import User
 from gestioncof.models import CofProfile, Clipper
+from gestioncof.decorators import buro_required
 
 
+@buro_required
 def autocomplete(request):
     if "q" not in request.GET:
         raise Http404

gestioncof/petits_cours_views.py

@@ -135,7 +135,7 @@ def _finalize_traitement(request, demande, proposals, proposed_for,
                          unsatisfied, attribdata, redo=False, errors=None):
     proposals = proposals.items()
     proposed_for = proposed_for.items()
-    attribdata = attribdata.items()
+    attribdata = list(attribdata.items())
     proposed_mails = _generate_eleve_email(demande, proposed_for)
     mainmail = render_template("petits-cours-mail-demandeur.txt",
                                {"proposals": proposals,
@@ -153,7 +153,8 @@ def _finalize_traitement(request, demande, proposals, proposed_for,
                    "proposed_mails": proposed_mails,
                    "mainmail": mainmail,
                    "attribdata":
-                   base64.b64encode(simplejson.dumps(attribdata)),
+                   base64.b64encode(simplejson.dumps(attribdata)
+                                              .encode('utf_8')),
                    "redo": redo,
                    "errors": errors,
                    })

gestioncof/views.py

@@ -346,7 +346,7 @@ def registration_form2(request, login_clipper=None, username=None):
             registration_set_ro_fields(user_form, profile_form)
             # events & clubs
             event_formset = EventFormset(events=events, prefix='events')
-            clubs_form = ClubsForm(initial={'clubs': member.clubs.all()})
+            clubs_form = ClubsForm()
     if username:
         member = get_object_or_404(User, username=username)
         (profile, _) = CofProfile.objects.get_or_create(user=member)