diff options
| author | Dan McGee <dan@archlinux.org> | 2013-11-25 21:10:25 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2013-11-25 21:10:25 -0600 |
| commit | 108cfaa8df3b94031a3436fbb71c76fdc0650ba1 (patch) | |
| tree | 61c30085b49e63c6605dfebac3bef5e123cbaa70 /devel/views.py | |
| parent | 06317908f73420224fce0c400048c3b7dcfc8abb (diff) | |
| parent | 071bd6bd71f681c45048fc0a0961e58d43d44d48 (diff) | |
Merge branch 'django-1.6'
Diffstat (limited to 'devel/views.py')
| -rw-r--r-- | devel/views.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/devel/views.py b/devel/views.py index b6e85822..29954b51 100644 --- a/devel/views.py +++ b/devel/views.py @@ -167,7 +167,7 @@ def change_profile(request): request.user.email = form.cleaned_data['email'] if form.cleaned_data['passwd1']: request.user.set_password(form.cleaned_data['passwd1']) - with transaction.commit_on_success(): + with transaction.atomic(): request.user.save() profile_form.save() return HttpResponseRedirect('/devel/') @@ -275,7 +275,7 @@ def report(request, report_name, username=None): cutoff = timedelta(hours=24) filtered = [] packages = packages.select_related( - 'arch', 'repo', 'packager').filter(pgp_signature__isnull=False) + 'arch', 'repo', 'packager').filter(signature_bytes__isnull=False) known_keys = DeveloperKey.objects.select_related( 'owner').filter(owner__isnull=False) known_keys = {dk.key: dk for dk in known_keys} @@ -335,7 +335,7 @@ def new_user_form(request): if request.POST: form = NewUserForm(request.POST) if form.is_valid(): - with transaction.commit_on_success(): + with transaction.atomic(): form.save() log_addition(request, form.instance.user) return HttpResponseRedirect('/admin/auth/user/%d/' % \ |