# HG changeset patch
# User Philippe Pepiot <philippe.pepiot@logilab.fr>
# Date 1488888803 -3600
# Node ID 3c9e296f0a6a7e1f2ec64bb1317eec6fec4e16be
# Parent  245a4f81053b1fa1acfcbcd92ecf64c1158f6f81
[web/views] fix bad html in deleteconf with show_composite=True

On an entity with no composite an additional item "None" was displayed.

diff -r 245a4f81053b -r 3c9e296f0a6a cubicweb/web/test/unittest_views_editforms.py
--- a/cubicweb/web/test/unittest_views_editforms.py	Thu Mar 23 12:09:59 2017 +0100
+++ b/cubicweb/web/test/unittest_views_editforms.py	Tue Mar 07 13:13:23 2017 +0100
@@ -294,6 +294,14 @@
                     req.find('Directory', name='child1').one().eid)
             self.assertIn(expected, source)
 
+            # No composite entities
+            rset = req.execute('Directory X WHERE X name "dtest4"')
+            source = self.view('deleteconf', rset,
+                               template=None, req=req).source.decode('utf-8')
+            expected = ('<li><a href="http://testing.fr/cubicweb/directory/%s">'
+                        'dtest4</a></li>') % (d4.eid,)
+            self.assertIn(expected, source)
+
     def test_automatic_edition_formview(self):
         with self.admin_access.web_request() as req:
             rset = req.execute('CWUser X')
diff -r 245a4f81053b -r 3c9e296f0a6a cubicweb/web/views/editforms.py
--- a/cubicweb/web/views/editforms.py	Thu Mar 23 12:09:59 2017 +0100
+++ b/cubicweb/web/views/editforms.py	Tue Mar 07 13:13:23 2017 +0100
@@ -123,7 +123,8 @@
                     content = tags.a(centity.view('textoutofcontext'),
                                      href=centity.absolute_url())
                 else:
-                    w(u'<li class="last">%s</li></ul>' % content)
+                    if content is not None:
+                        w(u'<li class="last">%s</li></ul>' % content)
             w(u'</li>\n')
         w(u'</ul>\n')
         form.render(w=self.w)