From eeab674b10b2fca2a4660a99202aa2dd07ee5594 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 22 Aug 2017 17:44:05 +0200
Subject: Fix templates with loop errors

---
 ishtar_common/templates/ishtar/wizard/confirm_wizard.html            | 4 ++--
 ishtar_common/templates/ishtar/wizard/wizard_done_summary.html       | 4 ++--
 ishtar_common/templates/ishtar/wizard/wizard_done_summary_2.html     | 4 ++--
 ishtar_common/templates/ishtar/wizard/wizard_list_search_result.html | 4 ++--
 ishtar_common/tests.py                                               | 2 +-
 ishtar_common/widgets.py                                             | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'ishtar_common')

diff --git a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
index 565256552..7339af9a8 100644
--- a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
@@ -18,8 +18,8 @@
   {% for form_label, form_data in datas %}
   <table class='confirm'>
     <caption>{{form_label}}</caption>
-    {% for label, data, cls in form_data %}
-    <tr{%if cls%} class='{{cls}}'{%endif%}><th>{{label}}</th><td>{{data}}</td></tr>
+    {% for data in form_data %}
+    <tr{%if data.2%} class='{{data.2}}'{%endif%}><th>{{data.0}}</th><td>{{data.1}}</td></tr>
     {% endfor %}
   </table>
   {% endfor %}
diff --git a/ishtar_common/templates/ishtar/wizard/wizard_done_summary.html b/ishtar_common/templates/ishtar/wizard/wizard_done_summary.html
index ad069a738..c82e32557 100644
--- a/ishtar_common/templates/ishtar/wizard/wizard_done_summary.html
+++ b/ishtar_common/templates/ishtar/wizard/wizard_done_summary.html
@@ -7,8 +7,8 @@
   {% for form_label, form_data in datas %}
   <table class='confirm'>
     <caption>{{form_label}}</caption>
-    {% for label, data, cls in form_data %}
-    <tr{%if cls%} class='{{cls}}'{%endif%}><th>{{label}}</th><td>{{data}}</td></th>
+    {% for data in form_data %}
+    <tr{%if data.2%} class='{{data.2}}'{%endif%}><th>{{data.0}}</th><td>{{data.1}}</td></th>
     {% endfor %}
   </table>
   {% endfor %}
diff --git a/ishtar_common/templates/ishtar/wizard/wizard_done_summary_2.html b/ishtar_common/templates/ishtar/wizard/wizard_done_summary_2.html
index 2b907ffc6..91f71de43 100644
--- a/ishtar_common/templates/ishtar/wizard/wizard_done_summary_2.html
+++ b/ishtar_common/templates/ishtar/wizard/wizard_done_summary_2.html
@@ -12,8 +12,8 @@
   {% for form_label, form_data in datas %}
   <table class='confirm'>
     <caption>{{form_label}}</caption>
-    {% for label, data, cls in form_data %}
-    <tr{%if cls%} class='{{cls}}'{%endif%}><th>{{label}}</th><td>{{data}}</td></th>
+    {% for data in form_data %}
+    <tr{%if data.2%} class='{{data.2}}'{%endif%}><th>{{data.0}}</th><td>{{data.1}}</td></th>
     {% endfor %}
   </table>
   {% endfor %}
diff --git a/ishtar_common/templates/ishtar/wizard/wizard_list_search_result.html b/ishtar_common/templates/ishtar/wizard/wizard_list_search_result.html
index aca1798d9..5b67c9ceb 100644
--- a/ishtar_common/templates/ishtar/wizard/wizard_list_search_result.html
+++ b/ishtar_common/templates/ishtar/wizard/wizard_list_search_result.html
@@ -14,8 +14,8 @@
   {% for form_label, form_data in datas %}
   <table class='confirm'>
     <caption>{{form_label}}</caption>
-    {% for label, data, cls in form_data %}
-    <tr{%if cls%} class='{{cls}}'{%endif%}><th>{{label}}</th><td>{{data}}</td></th>
+    {% for data in form_data %}
+    <tr{%if data.2%} class='{{data.2}}'{%endif%}><th>{{data.0}}</th><td>{{data.1}}</td></th>
     {% endfor %}
   </table>
   {% endfor %}
diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py
index 8f94b1b12..6f393a7e3 100644
--- a/ishtar_common/tests.py
+++ b/ishtar_common/tests.py
@@ -366,7 +366,7 @@ class AdminGenTypeTest(TestCase):
                 response.status_code, 200,
                 msg="Can not access admin list for {}.".format(model))
             if model in self.models_with_data:
-                url = base_url + "{}/".format(model.objects.all()[0].pk)
+                url = base_url + "{}/change/".format(model.objects.all()[0].pk)
                 response = self.client.get(url)
                 self.assertEqual(
                     response.status_code, 200,
diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py
index 79c0513c0..eb68bac2e 100644
--- a/ishtar_common/widgets.py
+++ b/ishtar_common/widgets.py
@@ -135,8 +135,8 @@ class Select2Multiple(forms.SelectMultiple):
             else:
                 options = "{"
             options += "     containerCssClass: 'full-width'}"
-        html = super(Select2Multiple, self).render(name, value, attrs,
-                                                   choices)
+        self.choices = choices
+        html = super(Select2Multiple, self).render(name, value, attrs)
         html += """<script type="text/javascript">
         $(document).ready(function() {{
             $("#id_{}").select2({});
-- 
cgit v1.2.3