cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

Merge branch 'elarnon/compat_fixes' into 'master'

Browse source 
Various fixes for Django 1.11

See merge request cof-geek/gestioCOF!294
This commit is contained in:
Martin Pepin 2018-02-20 14:38:21 +01:00
commit cadbd1b7c2
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bda/templates/bda/inscription-formset.html
View file

@ -14,7 +14,7 @@
</tr></thead> </tr></thead>
<tbody class="bda_formset_content"> <tbody class="bda_formset_content">
{% endif %} {% endif %}
<tr class="{% cycle row1,row2 %} dynamic-form {% if form.instance.pk %}has_original{% endif %}"> <tr class="{% cycle 'row1' 'row2' %} dynamic-form {% if form.instance.pk %}has_original{% endif %}">
{% for field in form.visible_fields %} {% for field in form.visible_fields %}
{% if field.name != "DELETE" and field.name != "priority" %} {% if field.name != "DELETE" and field.name != "priority" %}
<td class="bda-field-{{ field.name }}"> <td class="bda-field-{{ field.name }}">

2
gestioncof/templates/inscription-petit-cours-formset.html
View file

@ -16,7 +16,7 @@
</tr></thead> </tr></thead>
<tbody class="bda_formset_content"> <tbody class="bda_formset_content">
{% endif %} {% endif %}
<tr class="{% cycle row1,row2 %} dynamic-form {% if form.instance.pk %}has_original{% endif %}"> <tr class="{% cycle 'row1' 'row2' %} dynamic-form {% if form.instance.pk %}has_original{% endif %}">
{% for field in form.visible_fields %} {% for field in form.visible_fields %}
{% if field.name != "DELETE" and field.name != "priority" %} {% if field.name != "DELETE" and field.name != "priority" %}
<td class="bda-field-{{ field.name }}"> <td class="bda-field-{{ field.name }}">

2
requirements.txt
View file

@ -11,7 +11,7 @@ psycopg2
Pillow Pillow
six six
unicodecsv unicodecsv
django-bootstrap-form==3.2.1 django-bootstrap-form==3.3
asgiref==1.1.1 asgiref==1.1.1
daphne==1.3.0 daphne==1.3.0
asgi-redis==1.3.0 asgi-redis==1.3.0