From aa98096059413639d53341b02a99d64cda5ed515 Mon Sep 17 00:00:00 2001
From: Valentin Samir <valentin.samir@crans.org>
Date: Tue, 2 Aug 2016 13:24:57 +0200
Subject: [PATCH] Use custom templatetags instead settings custom attributes to
 Boundfields

As it do not work with django 1.7
---
 cas_server/forms.py                       |  8 ++------
 cas_server/templates/cas_server/form.html |  5 +++--
 cas_server/templatetags/__init__.py       |  0
 cas_server/templatetags/cas_server.py     | 14 ++++++++++++++
 4 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 cas_server/templatetags/__init__.py
 create mode 100644 cas_server/templatetags/cas_server.py

diff --git a/cas_server/forms.py b/cas_server/forms.py
index bcfaecb..54afb7f 100644
--- a/cas_server/forms.py
+++ b/cas_server/forms.py
@@ -26,15 +26,11 @@ class BootsrapForm(forms.Form):
     """
     def __init__(self, *args, **kwargs):
         super(BootsrapForm, self).__init__(*args, **kwargs)
-        for (name, field) in self.fields.items():
+        for field in self.fields.values():
             # Only tweak the fiel if it will be displayed
             if not isinstance(field.widget, forms.HiddenInput):
-                # tell to display the field (used in form.html)
-                self[name].display = True
                 attrs = {}
-                if isinstance(field.widget, forms.CheckboxInput):
-                    self[name].checkbox = True
-                else:
+                if not isinstance(field.widget, forms.CheckboxInput):
                     attrs['class'] = "form-control"
                     if field.label:  # pragma: no branch (currently all field are hidden or labeled)
                         attrs["placeholder"] = field.label
diff --git a/cas_server/templates/cas_server/form.html b/cas_server/templates/cas_server/form.html
index 5ac1463..f189f6b 100644
--- a/cas_server/templates/cas_server/form.html
+++ b/cas_server/templates/cas_server/form.html
@@ -1,10 +1,11 @@
+{% load cas_server %}
 {% for error in form.non_field_errors %}
 <div class="alert alert-danger alert-dismissable">
   <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&#215;</button>
   {{error}}
 </div>
 {% endfor %}
-{% for field in form %}{% if field.display %}
+{% for field in form %}{% if not field|is_hidden %}
 <div class="form-group{% spaceless %}
   {% if not form.non_field_errors %}
     {% if field.errors %} has-error
@@ -12,7 +13,7 @@
     {% endif %}
   {% endif %}"
 {% endspaceless %}>{% spaceless %}
-  {% if field.checkbox %}
+  {% if field|is_checkbox %}
     <div class="checkbox"><label for="{{field.auto_id}}">{{field}}{{field.label}}</label>
   {% else %}
     <label class="control-label" for="{{field.auto_id}}">{{field.label}}</label>
diff --git a/cas_server/templatetags/__init__.py b/cas_server/templatetags/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/cas_server/templatetags/cas_server.py b/cas_server/templatetags/cas_server.py
new file mode 100644
index 0000000..ec2839e
--- /dev/null
+++ b/cas_server/templatetags/cas_server.py
@@ -0,0 +1,14 @@
+from django import template
+from django import forms
+
+register = template.Library()
+
+
+@register.filter(name='is_checkbox')
+def is_checkbox(field):
+    return isinstance(field.field.widget, forms.CheckboxInput)
+
+
+@register.filter(name='is_hidden')
+def is_hidden(field):
+    return isinstance(field.field.widget, forms.HiddenInput)