From bbdbbff7068f92fa26e6468880125173edc8d776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Tue, 27 Oct 2015 11:40:08 +0100
Subject: [PATCH] fields: fix display of item field where no elements are
 defined (#8785)

---
 tests/test_fields.py | 10 ++++++++--
 wcs/fields.py        |  5 ++++-
 wcs/qommon/form.py   |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/tests/test_fields.py b/tests/test_fields.py
index e8e5984..c63712a 100644
--- a/tests/test_fields.py
+++ b/tests/test_fields.py
@@ -175,13 +175,19 @@ def test_item_render():
     assert str(form.render()).count('<option') == 4
 
     # without any item
-    field = fields.ItemField(id='1', label='Foobar', items=[])
+    field = fields.ItemField(id='1', label='Foobar', items=None)
     form = Form()
     field.add_to_form(form)
     assert str(form.render()).count('<option') == 1
 
     # without any item and not being required
-    field = fields.ItemField(id='1', label='Foobar', items=[], required=False)
+    field = fields.ItemField(id='1', label='Foobar', items=None, required=False)
+    form = Form()
+    field.add_to_form(form)
+    assert str(form.render()).count('<option') == 1
+
+    # without any item but with an hint
+    field = fields.ItemField(id='1', label='Foobar', items=None, hint='HELLO WORLD')
     form = Form()
     field.add_to_form(form)
     assert str(form.render()).count('<option') == 1
diff --git a/wcs/fields.py b/wcs/fields.py
index b90aebe..bc6ce64 100644
--- a/wcs/fields.py
+++ b/wcs/fields.py
@@ -858,7 +858,10 @@ class ItemField(WidgetField):
 
     def get_options(self):
         if not self.data_source:
-            options = self.items[:]
+            if self.items:
+                options = self.items[:]
+            else:
+                options = []
         else:
             options = data_sources.get_items(self.data_source)
         if options and not self.required:
diff --git a/wcs/qommon/form.py b/wcs/qommon/form.py
index fa84468..68840b8 100644
--- a/wcs/qommon/form.py
+++ b/wcs/qommon/form.py
@@ -1366,7 +1366,7 @@ class SingleSelectHintWidget(SingleSelectWidget):
         if not self.separate_hint() and self.hint:
             r = htmltag('option', value='', selected=None)
             tags.append(r + htmlescape(self.hint) + htmltext('</option>'))
-            if not self.required:
+            if not self.required or self.options[0][0] is None:
                 # hint has been put as first element, skip the default empty
                 # value.
                 options = self.options[1:]
-- 
2.6.2