Integrate piernov code, added badge, missing deletion handling

2015-07-27 02:04:47 +02:00
parent 7e80490b17
commit b5c9e83bd9
19 changed files with 749 additions and 431 deletions
@@ -156,8 +156,9 @@ class ConfUpdateForm(ConfCreateForm):
 class SalleForm(MyBaseForm):
    year_uid      = SelectField(u'Année', coerce=int)
    phy_salle_id  = SelectField('Salle Physique', coerce=int)
-    place_type    = SelectField('Type', choices=[('Conference','Conference'),
-                        ('Stand','Stand'), ('Ateliers','Ateliers'), ('Autres','Autres') ])
+    place_type    = SelectField('Type', choices=[('Conference',u'Conférence'),
+                        ('Stand','Stand'), ('Atelier','Atelier'), ('Table ronde','Table ronde'), 
+                        ('MAO','MAO'), ('Repas','Repas / Snack'), ('Autres','Autres') ])
    name          = TextField('Nom de la salle', [validators.Length(min=1, max=40)],
                        filters=[strip_filter])
    description   = TextAreaField('Description',