Permalink
Browse files

fix merge conflicts

  • Loading branch information...
2 parents 3f62e40 + e9ec717 commit 9c2d3e7f69b3ab038efddba51fb2edc389f341fe @mcdonc mcdonc committed Mar 24, 2011
Showing with 8 additions and 1 deletion.
  1. +7 −0 CHANGES.txt
  2. +1 −1 pyramid_deform/__init__.py
View
@@ -1,3 +1,10 @@
+Next release
+------------
+
+- Fix syntax error in javascript when ajax_options are not specified. Use a
+ string representing an empty javascript object as the default for
+ ajax_options.
+
0.1.6 (2011-03-24)
------------------
@@ -15,7 +15,7 @@ def __init__(self, request):
def __call__(self):
use_ajax = getattr(self, 'use_ajax', False)
- ajax_options = getattr(self, 'ajax_options', '')
+ ajax_options = getattr(self, 'ajax_options', '{}')
self.schema = self.schema.bind(request=self.request)
form = self.form_class(self.schema, buttons=self.buttons,
use_ajax=use_ajax, ajax_options=ajax_options)

0 comments on commit 9c2d3e7

Please sign in to comment.