cco/cybertools
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'bbmaster' of ssh://git.cy55.de/home/git/cybertools into bbmaster

Browse source
This commit is contained in:
hplattner 2012-03-06 09:49:50 +01:00
commit db7e10ac51
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
composer/schema/grid/field.py
View file

@ -128,7 +128,7 @@ class GridFieldInstance(ListFieldInstance):
class RecordsFieldInstance(GridFieldInstance): class RecordsFieldInstance(GridFieldInstance):
def getRenderer(self, name): def getRenderer(self, name):
return grid_macros.macros[name] return grid_macros.macros.get(name)
def marshall(self, value): def marshall(self, value):
result = [] result = []

6
stateful/base.py
View file

@ -51,8 +51,10 @@ class Stateful(object):
return self.state return self.state
def getStateObject(self): def getStateObject(self):
state = self.getState() states = self.getStatesDefinition().states
return self.getStatesDefinition().states[state] if self.state not in states:
self.state = self.getStatesDefinition().initialState
return states[self.state]
def doTransition(self, transition, historyInfo=None): def doTransition(self, transition, historyInfo=None):
sd = self.getStatesDefinition() sd = self.getStatesDefinition()