From 7f1aa068e9486d9ac57d575c06828dd4f395e0a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Mon, 8 Feb 2016 09:04:19 +0100
Subject: [PATCH] forms: never insert empty <li><div> in journal (#9901)

---
 wcs/forms/common.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/wcs/forms/common.py b/wcs/forms/common.py
index b23a11e..f2d9d74 100644
--- a/wcs/forms/common.py
+++ b/wcs/forms/common.py
@@ -285,9 +285,6 @@ class FormStatusPage(Directory):
                     except KeyError:
                         pass
 
-            r += htmltext('<li class="%s">' % klass)
-            r += htmltext('<div>')
-
             status_block = TemplateIO(html=True)
             if evo.status:
                 status_block += htmltext('<div class="evolution-metadata">')
@@ -320,9 +317,16 @@ class FormStatusPage(Directory):
                 parts += t
 
             parts_value = parts.getvalue()
-            if parts_value or evo.status != previous_status:
+
+            if not (parts_value or evo.status != previous_status):
+                continue
+
+            if evo.status:
                 previous_status = evo.status
-                r += status_block.getvalue()
+
+            r += htmltext('<li class="%s">' % klass)
+            r += htmltext('<div>')
+            r += status_block.getvalue()
 
             if parts_value:
                 r += htmltext('<div class="msg">')
-- 
2.7.0