Editing user settings works.

[~kgodey/maayanwich.git] / views.py

diff --git a/views.py b/views.py
index 7db1ab5..879c303 100644 (file)
--- a/views.py
+++ b/views.py
@@ -146,10 +146,6 @@ def current_home(request):
 def specific_sandwich(request, slug):
        try:
                s = Sandwich.objects.get(slug=slug)
-               if Sandwich.objects.count() > 5:
-                       sandwiches = Sandwich.objects.order_by('-date_made')[:5]
-               else:
-                       sandwiches = Sandwich.objects.order_by('-date_made')
        except Sandwich.DoesNotExist:
                raise Http404
        return render_to_response('onesandwich.html', {'s': s,}, context_instance=RequestContext(request))
@@ -208,17 +204,13 @@ def login_view2(request):
                        else:
                                return HttpResponseRedirect(x)
                else:
-                       return HttpResponseRedirect('login')
+                       return HttpResponseRedirect('login2')
        except KeyError:
                aform = AuthenticationForm()
                return render_to_response('pleaselogin.html', {'aform': aform,}, context_instance=RequestContext(request))
 
 
 def create_user(request):
-       if Sandwich.objects.count() > 5:
-               sandwiches = Sandwich.objects.order_by('-date_made')[:5]
-       else:
-               sandwiches = Sandwich.objects.order_by('-date_made')
        if request.user.is_authenticated():
                return HttpResponseRedirect('index')
        elif request.method == 'POST': # If the form has been submitted...
@@ -243,6 +235,34 @@ def create_user(request):
                form = NewUserForm() # An unbound form
                return render_to_response('newuser.html', {'cform': form,}, context_instance=RequestContext(request))
                
+def edit_user(request, gusername):
+       guser = User.objects.get(username = gusername)
+       if not request.user.is_authenticated():
+               return HttpResponseRedirect(reverse('login2'))
+       elif request.user == guser:
+               if request.method == 'POST': # If the form has been submitted...
+                       form = NewUserForm(request.POST) # A form bound to the POST data
+                       username = request.POST['username']
+                       first_name = request.POST['first_name']
+                       last_name = request.POST['last_name']
+                       password = request.POST['password']
+                       cpassword = request.POST['confirm_password']
+                       email = request.POST['email']
+                       guser.username = username
+                       guser.first_name = first_name
+                       guser.last_name = last_name
+                       if not password.strip() == '':
+                               if password == cpassword:
+                                       guser.set_password(password)
+                       guser.email = email
+                       guser.save()
+                       return HttpResponseRedirect(reverse('edit_user', kwargs={'gusername':guser.username}))  
+               else:
+                       form = NewUserForm(initial={'username': guser.username, 'first_name': guser.first_name, 'last_name': guser.last_name, 'email': guser.email, }) # An unbound form
+                       return render_to_response('edituser.html', {'cform': form,}, context_instance=RequestContext(request))
+       else:
+               return HttpResponseRedirect(reverse('index'))
+               
 
 def comment_posted(request):
        if request.GET['c']: