Merge branch 'master' into bbmaster

2012-03-01 17:29:36 +01:00 · 2012-03-01 17:29:36 +01:00 · 1421e8cb1a
commit 1421e8cb1a
parent f654890a6e 6d29d5decf
1 changed files with 1 additions and 1 deletions
--- 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 = []