diff options
Diffstat (limited to 'django/contrib/admin/options.py')
| -rw-r--r-- | django/contrib/admin/options.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 090a9f6bc6..1c27dc400b 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -831,10 +831,7 @@ class ModelAdmin(BaseModelAdmin): # Then gather them from the model admin and all parent classes, # starting with self and working back up. for klass in self.__class__.mro()[::-1]: - class_actions = getattr(klass, 'actions', []) - # Avoid trying to iterate over None - if not class_actions: - continue + class_actions = getattr(klass, 'actions', []) or [] actions.extend(self.get_action(action) for action in class_actions) # get_action might have returned None, so filter any of those out. @@ -1498,11 +1495,10 @@ class ModelAdmin(BaseModelAdmin): ModelForm = self.get_form(request, obj) if request.method == 'POST': form = ModelForm(request.POST, request.FILES, instance=obj) - if form.is_valid(): - form_validated = True + form_validated = form.is_valid() + if form_validated: new_object = self.save_form(request, form, change=not add) else: - form_validated = False new_object = form.instance formsets, inline_instances = self._create_formsets(request, new_object, change=not add) if all_valid(formsets) and form_validated: |