From ebe3e94fde884ef3157a546b4a74afeaea5c245c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Fri, 22 Feb 2013 10:19:06 +0100 Subject: [PATCH] formdata: catch various bugs happening with draft forms --- wcs/formdata.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/wcs/formdata.py b/wcs/formdata.py index 85df0856c..7c2fda1ff 100644 --- a/wcs/formdata.py +++ b/wcs/formdata.py @@ -168,6 +168,8 @@ class FormData(StorableObject): def display_workflow_message(self): wf_status = self.get_workflow_status() + if not wf_status: + return '' for status in wf_status.items: if hasattr(status, 'get_message'): return status.get_message(self) @@ -209,6 +211,8 @@ class FormData(StorableObject): def get_workflow_form(self, user): wf_status = self.get_workflow_status() + if not wf_status: + return None return wf_status.get_action_form(self, user) def get_workflow_subdirectories(self): @@ -289,8 +293,9 @@ class FormData(StorableObject): if self.formdef.workflow and self.status: wf_status = self.get_workflow_status() - for item in wf_status.items: - d.update(item.get_substitution_variables(self)) + if wf_status: + for item in wf_status.items: + d.update(item.get_substitution_variables(self)) return d