From 1c1f259d4f7a040805bf1d5db7d3a9cbcd44ebc7 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Tue, 25 Sep 2012 11:15:50 +0200
Subject: [PATCH] fix 'state' report field (backport from bluebream version)

---
 expert/browser/results.pt | 3 ++-
 expert/field.py           | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/expert/browser/results.pt b/expert/browser/results.pt
index 2fd8129..4a04496 100644
--- a/expert/browser/results.pt
+++ b/expert/browser/results.pt
@@ -70,7 +70,8 @@
 
 <metal:state define-macro="state">
   <tal:column define=" value python:col.getDisplayValue(row)">
-    <img tal:attributes="src string:$resourceBase${value/icon};
+    <img tal:condition="value"
+         tal:attributes="src string:$resourceBase${value/icon};
                          alt value/title;
                          title value/title" />
   </tal:column>
diff --git a/expert/field.py b/expert/field.py
index 2ff64af..ff813cb 100644
--- a/expert/field.py
+++ b/expert/field.py
@@ -109,6 +109,8 @@ class StateField(Field):
     def getDisplayValue(self, row):
         if IStateful.providedBy(row.context):
             stf = row.context
+        elif row.context is None:
+            return None
         else:
             stf = component.getAdapter(row.context, IStateful, 
                                         name=self.statesDefinition)