diff --git a/djadmin2/actions.py b/djadmin2/actions.py index edf5c39..38e21eb 100644 --- a/djadmin2/actions.py +++ b/djadmin2/actions.py @@ -41,7 +41,7 @@ class BaseListAction(AdminModel2Mixin, TemplateView): options = utils.model_options(self.model) self.app_label = options.app_label - self.model_name = options.module_name + self.model_name = options.model_name self.item_count = len(queryset) diff --git a/example/blog/tests/test_modelforms.py b/example/blog/tests/test_modelforms.py index 6845d47..7d63b11 100644 --- a/example/blog/tests/test_modelforms.py +++ b/example/blog/tests/test_modelforms.py @@ -12,7 +12,7 @@ from ..models import Post class ModelFormFactoryTest(TestCase): def test_modelform_factory(self): - form_class = modelform_factory(Post) + form_class = modelform_factory(Post, exclude=[]) self.assertTrue(form_class) field = form_class.base_fields['title'] self.assertTrue(isinstance(field.widget, floppyforms.TextInput)) @@ -358,7 +358,7 @@ class ModelFormTest(TestCase): class MyForm(forms.ModelForm): pass - form_class = modelform_factory(model=Post, form=MyForm) + form_class = modelform_factory(model=Post, form=MyForm, exclude=[]) form = form_class() self.assertTrue(isinstance( form.fields['title'].widget, @@ -368,7 +368,7 @@ class ModelFormTest(TestCase): class MyForm(forms.ModelForm): subtitle = forms.CharField() - form_class = modelform_factory(model=Post, form=MyForm) + form_class = modelform_factory(model=Post, form=MyForm, exclude=[]) self.assertTrue(isinstance( form_class.base_fields['subtitle'].widget, floppyforms.widgets.TextInput)) @@ -385,7 +385,7 @@ class ModelFormTest(TestCase): class MyForm(forms.ModelForm): subtitle = forms.CharField() - form_class = modelform_factory(model=Post, form=MyForm) + form_class = modelform_factory(model=Post, form=MyForm, exclude=[]) form = form_class() self.assertTrue(isinstance( form.fields['subtitle'].widget, @@ -397,11 +397,12 @@ class ModelFormTest(TestCase): class Meta: model = Post + exclude = [] class ChildForm(MyForm): created = forms.DateField() - form_class = modelform_factory(model=Post, form=ChildForm) + form_class = modelform_factory(model=Post, form=ChildForm, exclude=[]) form = form_class() self.assertTrue(isinstance( form.fields['title'].widget, @@ -427,6 +428,7 @@ class FieldWidgetTest(TestCase): class Meta: model = Post + exclude = [] form_class = floppify_form(MyForm) widget = form_class().fields['email'].widget @@ -437,7 +439,7 @@ class FieldWidgetTest(TestCase): class MyForm(forms.ModelForm): float = forms.FloatField() - form_class = modelform_factory(model=Post, form=MyForm) + form_class = modelform_factory(model=Post, form=MyForm, exclude=[]) widget = form_class().fields['float'].widget self.assertTrue(isinstance(widget, floppyforms.widgets.NumberInput)) self.assertEqual(widget.input_type, 'number') @@ -446,7 +448,7 @@ class FieldWidgetTest(TestCase): class MyForm(forms.ModelForm): decimal = forms.DecimalField() - form_class = modelform_factory(model=Post, form=MyForm) + form_class = modelform_factory(model=Post, form=MyForm, exclude=[]) widget = form_class().fields['decimal'].widget self.assertTrue(isinstance(widget, floppyforms.widgets.NumberInput)) self.assertEqual(widget.input_type, 'number') @@ -455,7 +457,7 @@ class FieldWidgetTest(TestCase): class MyForm(forms.ModelForm): integer = forms.IntegerField() - form_class = modelform_factory(model=Post, form=MyForm) + form_class = modelform_factory(model=Post, form=MyForm, exclude=[]) widget = form_class().fields['integer'].widget self.assertTrue(isinstance(widget, floppyforms.widgets.NumberInput)) self.assertEqual(widget.input_type, 'number') @@ -464,7 +466,7 @@ class FieldWidgetTest(TestCase): class MyForm(forms.ModelForm): email = forms.EmailField() - form_class = modelform_factory(model=Post, form=MyForm) + form_class = modelform_factory(model=Post, form=MyForm, exclude=[]) widget = form_class().fields['email'].widget self.assertTrue(isinstance(widget, floppyforms.widgets.EmailInput)) self.assertEqual(widget.input_type, 'email') @@ -473,7 +475,7 @@ class FieldWidgetTest(TestCase): class MyForm(forms.ModelForm): url = forms.URLField() - form_class = modelform_factory(model=Post, form=MyForm) + form_class = modelform_factory(model=Post, form=MyForm, exclude=[]) widget = form_class().fields['url'].widget self.assertTrue(isinstance(widget, floppyforms.widgets.URLInput)) self.assertEqual(widget.input_type, 'url') @@ -482,7 +484,7 @@ class FieldWidgetTest(TestCase): class MyForm(forms.ModelForm): slug = forms.SlugField() - form_class = modelform_factory(model=Post, form=MyForm) + form_class = modelform_factory(model=Post, form=MyForm, exclude=[]) widget = form_class().fields['slug'].widget self.assertTrue(isinstance(widget, floppyforms.widgets.SlugInput)) self.assertEqual(widget.input_type, 'text') @@ -491,7 +493,7 @@ class FieldWidgetTest(TestCase): class MyForm(forms.ModelForm): ipaddress = forms.IPAddressField() - form_class = modelform_factory(model=Post, form=MyForm) + form_class = modelform_factory(model=Post, form=MyForm, exclude=[]) widget = form_class().fields['ipaddress'].widget self.assertTrue(isinstance(widget, floppyforms.widgets.IPAddressInput)) self.assertEqual(widget.input_type, 'text') @@ -500,7 +502,7 @@ class FieldWidgetTest(TestCase): class MyForm(forms.ModelForm): splitdatetime = forms.SplitDateTimeField() - form_class = modelform_factory(model=Post, form=MyForm) + form_class = modelform_factory(model=Post, form=MyForm, exclude=[]) widget = form_class().fields['splitdatetime'].widget self.assertTrue(isinstance( widget, floppyforms.widgets.SplitDateTimeWidget))