From 6d29d5decf89663c7c1acc97cc99ca746064788e Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Wed, 29 Feb 2012 08:29:29 +0100 Subject: [PATCH 1/2] fallback for records (grid) field renderer --- composer/schema/grid/field.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer/schema/grid/field.py b/composer/schema/grid/field.py index 95195f0..9c93d7a 100644 --- a/composer/schema/grid/field.py +++ b/composer/schema/grid/field.py @@ -128,7 +128,7 @@ class GridFieldInstance(ListFieldInstance): class RecordsFieldInstance(GridFieldInstance): def getRenderer(self, name): - return grid_macros.macros[name] + return grid_macros.macros.get(name) def marshall(self, value): result = [] From 6fe560cd31b79284a6179b063db28379342c4d7b Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Sat, 3 Mar 2012 11:54:13 +0100 Subject: [PATCH 2/2] fall back to initial state if current state is not valid, e.g. because of changes in states definition --- stateful/base.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/stateful/base.py b/stateful/base.py index 3d64858..9f41686 100644 --- a/stateful/base.py +++ b/stateful/base.py @@ -51,8 +51,10 @@ class Stateful(object): return self.state def getStateObject(self): - state = self.getState() - return self.getStatesDefinition().states[state] + states = self.getStatesDefinition().states + if self.state not in states: + self.state = self.getStatesDefinition().initialState + return states[self.state] def doTransition(self, transition, historyInfo=None): sd = self.getStatesDefinition()