diff --git a/dojango/forms/widgets.py b/dojango/forms/widgets.py index f07de92..2b5f022 100644 --- a/dojango/forms/widgets.py +++ b/dojango/forms/widgets.py @@ -19,7 +19,7 @@ 'DojoWidgetMixin', 'Input', 'Widget', 'TextInput', 'PasswordInput', 'HiddenInput', 'MultipleHiddenInput', 'FileInput', 'Textarea', 'DateInput', 'DateTimeInput', 'TimeInput', 'CheckboxInput', 'Select', - 'NullBooleanSelect', 'SelectMultiple', 'RadioInput', 'RadioFieldRenderer', + 'NullBooleanSelect', 'SelectMultiple', 'RadioInput', 'RadioSelect', 'RadioFieldRenderer', 'RadioSelect', 'CheckboxSelectMultiple', 'MultiWidget', 'SplitDateTimeWidget', 'SplitHiddenDateTimeWidget', 'SimpleTextarea', 'EditorInput', 'HorizontalSliderInput', 'VerticalSliderInput', 'ValidationTextInput', 'ValidationPasswordInput', @@ -283,7 +283,8 @@ class NullBooleanSelect(DojoWidgetMixin, widgets.NullBooleanSelect): class SelectMultiple(DojoWidgetMixin, widgets.SelectMultiple): dojo_type = 'dijit.form.MultiSelect' -RadioInput = widgets.RadioInput +RadioSelect = widgets.RadioSelect +RadioInput = widgets.RadioSelect RadioFieldRenderer = widgets.RadioFieldRenderer class RadioSelect(DojoWidgetMixin, widgets.RadioSelect): diff --git a/dojango/util/__init__.py b/dojango/util/__init__.py index 42db701..ccdbe55 100644 --- a/dojango/util/__init__.py +++ b/dojango/util/__init__.py @@ -219,7 +219,7 @@ def to_json_response(data, func_name=None, use_iframe=False): if use_iframe: mimetype = "text/html" data = render_to_string("dojango/json_iframe.html", {'json_data': data}) - ret = HttpResponse(data, mimetype=mimetype+"; charset=%s" % settings.DEFAULT_CHARSET) + ret = HttpResponse(data, content_type=mimetype+"; charset=%s" % settings.DEFAULT_CHARSET) # The following are for IE especially ret['Pragma'] = "no-cache" ret['Cache-Control'] = "must-revalidate"