From f123348c7dfb50353a6a555bfe44d11defa60269 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 20 Jun 2010 23:56:01 -0500 Subject: Update to the new messages framework This is also another step in making sure we don't unnecessarily access the Django session object and thus add a Vary cache control header we don't want. Signed-off-by: Dan McGee --- packages/views.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'packages') diff --git a/packages/views.py b/packages/views.py index c3a6c2bb..f085c913 100644 --- a/packages/views.py +++ b/packages/views.py @@ -1,4 +1,5 @@ from django import forms +from django.contrib import messages from django.core.mail import send_mail from django.shortcuts import render_to_response from django.template import loader, Context, RequestContext @@ -59,15 +60,14 @@ def update(request): user=request.user) rels.delete() - request.user.message_set.create(message="%d packages %sed" % ( - len(pkgs), mode)) + messages.info(request, "%d packages %sed." % (count, mode)) if disallowed_pkgs: - request.user.message_set.create( - message="You do not have permission to adopt: %s" % ( - ' '.join([p.pkgname for p in disallowed_pkgs]) + messages.warning(request, + "You do not have permission to %s: %s" % ( + mode, ' '.join([p.pkgname for p in disallowed_pkgs]) )) else: - request.user.message_set.create(message="update called without adopt/disown") + messages.error(request, "Are you trying to adopt or disown?") return HttpResponseRedirect('/packages/') def details(request, name='', repo='', arch=''): @@ -247,11 +247,14 @@ def signoff_package(request, arch, pkgname): pkgrel=pkg.pkgrel, packager=request.user) - message = "You have successfully" if created else "You have already" - request.user.message_set.create( - message="%s signed off for %s on %s" % ( - message, pkg.pkgname, pkg.arch)) - + if created: + messages.info(request, + "You have successfully signed off for %s on %s." % \ + (pkg.pkgname, pkg.arch)) + else: + messages.warning(request, + "You have already signed off for %s on %s." % \ + (pkg.pkgname, pkg.arch)) return signoffs(request) def flaghelp(request): -- cgit v1.2.3-54-g00ecf