# HG changeset patch
# User raph
# Date 1263545653 -3600
# Node ID a431fee55c9697a8b3e239e925369d5647be56cd
# Parent  2d964b42de452b70fb140449f8d7df2d84e8b290
raise 404 instead of 500 if user key does not exist

diff -r 2d964b42de45 -r a431fee55c96 src/cm/views/user.py
--- a/src/cm/views/user.py	Fri Jan 15 09:21:47 2010 +0100
+++ b/src/cm/views/user.py	Fri Jan 15 09:54:13 2010 +0100
@@ -350,7 +350,6 @@
 def user_suspend(request, key):
     if request.method == 'POST':
         profile = get_object_or_404(UserProfile, key=key)
-        profile = UserProfile.objects.get(key=key)
         profile.is_suspended = True
         profile.save()
         if profile.user.is_active:            
@@ -369,7 +368,6 @@
 def user_enable(request, key):
     if request.method == 'POST':
         profile = get_object_or_404(UserProfile, key=key)
-        profile = UserProfile.objects.get(key=key)
         profile.is_suspended = False
         profile.save()
         if profile.user.is_active:
@@ -444,7 +442,7 @@
 
 @has_global_perm('can_manage_workspace')    
 def user_edit(request, key):
-    profile = UserProfile.objects.get(key=key)
+    profile = get_object_or_404(UserProfile, key=key)
     user = profile.user
     userrole = profile.global_userrole()
     if request.method == 'POST':
@@ -481,7 +479,7 @@
 
 @login_required
 def user_contact(request, key):
-    recipient_profile = UserProfile.objects.get(key=key)
+    recipient_profile = get_object_or_404(UserProfile, key=key)
 
     if request.method == 'POST':
         contact_form = UserContactForm(request.POST)