Merge commit '125a107' into develop

Conflicts: tw2/forms/widgets.py
toscawidgets · Sep 6, 2012 · d4e3db4 · d4e3db4
2 parents 3c040e5 + 125a107
commit d4e3db4
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/tw2/forms/widgets.py b/tw2/forms/widgets.py
@@ -13,10 +13,7 @@ class FormField(twc.Widget):
         'dom name',
         request_local=False,
         attribute=True,
-        # Default to compound_id *unless* the user has specified a data key.
-        default=property(
-            lambda s: (s.key and s.key != s.id) and s.key or s.compound_id
-        )
+        default=property(lambda s: hasattr(s, 'compound_key') and s.compound_key or s.compound_id)
     )
 
     @property