diff options
Diffstat (limited to 'django/views/generic/create_update.py')
| -rw-r--r-- | django/views/generic/create_update.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/django/views/generic/create_update.py b/django/views/generic/create_update.py index b5fdd3e4cc..3a03fa59e4 100644 --- a/django/views/generic/create_update.py +++ b/django/views/generic/create_update.py @@ -4,9 +4,9 @@ from django import forms from django.db.models import FileField from django.contrib.auth.views import redirect_to_login from django.template import RequestContext -from django.core.paginator import ObjectPaginator, InvalidPage from django.http import Http404, HttpResponse, HttpResponseRedirect from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured +from django.utils.translation import gettext def create_object(request, model, template_name=None, template_loader=loader, extra_context=None, post_save_redirect=None, @@ -20,7 +20,7 @@ def create_object(request, model, template_name=None, the form wrapper for the object """ if extra_context is None: extra_context = {} - if login_required and request.user.is_anonymous(): + if login_required and not request.user.is_authenticated(): return redirect_to_login(request.path) manipulator = model.AddManipulator(follow=follow) @@ -39,8 +39,8 @@ def create_object(request, model, template_name=None, # No errors -- this means we can save the data! new_object = manipulator.save(new_data) - if not request.user.is_anonymous(): - request.user.message_set.create(message="The %s was created successfully." % model._meta.verbose_name) + if request.user.is_authenticated(): + request.user.message_set.create(message=gettext("The %(verbose_name)s was created successfully.") % {"verbose_name": model._meta.verbose_name}) # Redirect to the new object: first by trying post_save_redirect, # then by obj.get_absolute_url; fail if neither works. @@ -86,7 +86,7 @@ def update_object(request, model, object_id=None, slug=None, the original object being edited """ if extra_context is None: extra_context = {} - if login_required and request.user.is_anonymous(): + if login_required and not request.user.is_authenticated(): return redirect_to_login(request.path) # Look up the object to be edited @@ -102,7 +102,7 @@ def update_object(request, model, object_id=None, slug=None, except ObjectDoesNotExist: raise Http404, "No %s found for %s" % (model._meta.verbose_name, lookup_kwargs) - manipulator = model.ChangeManipulator(getattr(object, object._meta.pk.name), follow=follow) + manipulator = model.ChangeManipulator(getattr(object, object._meta.pk.attname), follow=follow) if request.POST: new_data = request.POST.copy() @@ -113,8 +113,8 @@ def update_object(request, model, object_id=None, slug=None, if not errors: object = manipulator.save(new_data) - if not request.user.is_anonymous(): - request.user.message_set.create(message="The %s was updated successfully." % model._meta.verbose_name) + if request.user.is_authenticated(): + request.user.message_set.create(message=gettext("The %(verbose_name)s was updated successfully.") % {"verbose_name": model._meta.verbose_name}) # Do a post-after-redirect so that reload works, etc. if post_save_redirect: @@ -142,7 +142,7 @@ def update_object(request, model, object_id=None, slug=None, else: c[key] = value response = HttpResponse(t.render(c)) - populate_xheaders(request, response, model, getattr(object, object._meta.pk.name)) + populate_xheaders(request, response, model, getattr(object, object._meta.pk.attname)) return response def delete_object(request, model, post_delete_redirect, @@ -162,7 +162,7 @@ def delete_object(request, model, post_delete_redirect, the original object being deleted """ if extra_context is None: extra_context = {} - if login_required and request.user.is_anonymous(): + if login_required and not request.user.is_authenticated(): return redirect_to_login(request.path) # Look up the object to be edited @@ -180,8 +180,8 @@ def delete_object(request, model, post_delete_redirect, if request.method == 'POST': object.delete() - if not request.user.is_anonymous(): - request.user.message_set.create(message="The %s was deleted." % model._meta.verbose_name) + if request.user.is_authenticated(): + request.user.message_set.create(message=gettext("The %(verbose_name)s was deleted.") % {"verbose_name": model._meta.verbose_name}) return HttpResponseRedirect(post_delete_redirect) else: if not template_name: @@ -196,5 +196,5 @@ def delete_object(request, model, post_delete_redirect, else: c[key] = value response = HttpResponse(t.render(c)) - populate_xheaders(request, response, model, getattr(object, object._meta.pk.name)) + populate_xheaders(request, response, model, getattr(object, object._meta.pk.attname)) return response |