Comments fully integrated.

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

diff --git a/views.py b/views.py
index 38556df..d653118 100644 (file)
--- a/views.py
+++ b/views.py
@@ -6,6 +6,7 @@ from django.core.files.uploadedfile import SimpleUploadedFile
 from models import Sandwich, Ingredient
 from django.contrib.auth import authenticate, login, logout
 from django.contrib.auth.forms import AuthenticationForm
+from django.contrib.comments.models import Comment
 from django.template import RequestContext
 from django.core import serializers
 from slugify import SlugifyUniquely
@@ -49,7 +50,7 @@ def add_sandwich(request):
                        form = SandwichForm(initial={'user': request.user}) # An unbound form
                return render_to_response('sandwich.html', {'sform': form,}, context_instance=RequestContext(request))
        else:
-               return HttpResponseRedirect(reverse('login'))
+               return HttpResponseRedirect(reverse('login2'))
 
 def add_ingredient(request):
        if request.user.is_authenticated():
@@ -70,7 +71,7 @@ def add_ingredient(request):
 
 def all_sandwich(request):
        try:
-               allsandwiches = Sandwich.objects.all()
+               allsandwiches = Sandwich.objects.order_by('-date_made')
        except Sandwich.DoesNotExist:
                raise Http404
        return render_to_response('allsandwiches.html', {'allsandwiches': allsandwiches,}, context_instance=RequestContext(request))
@@ -139,6 +140,30 @@ def login_view(request):
        except KeyError:
                aform = AuthenticationForm()
                return render_to_response('login.html', {'aform': aform,}, context_instance=RequestContext(request))
+               
+def login_view2(request):
+       x = reverse('index')
+       if 'HTTP_REFERER' in request.META:
+               x = request.META['HTTP_REFERER']
+       if Sandwich.objects.count() > 5:
+               sandwiches = Sandwich.objects.order_by('-date_made')[:5]
+       else:
+               sandwiches = Sandwich.objects.order_by('-date_made')
+       try:
+               username = request.POST['username']
+               password = request.POST['password']
+               user = authenticate(username=username, password=password)
+               if user is not None:
+                       if user.is_active:
+                               login(request, user)
+                               return HttpResponseRedirect(x)
+                       else:
+                               return HttpResponseRedirect(x)
+               else:
+                       return HttpResponseRedirect('login')
+       except KeyError:
+               aform = AuthenticationForm()
+               return render_to_response('pleaselogin.html', {'aform': aform,}, context_instance=RequestContext(request))
 
 
 def create_user(request):
@@ -169,6 +194,15 @@ def create_user(request):
        else:
                form = NewUserForm() # An unbound form
                return render_to_response('newuser.html', {'cform': form,}, context_instance=RequestContext(request))
+               
+
+def comment_posted(request):
+       if request.GET['c']:
+               comment_id  = request.GET['c']
+               com = Comment.objects.get( pk = comment_id )
+               post = com.content_object
+               if post:
+                       return HttpResponseRedirect( post.get_absolute_url() + '#comments' )
 
 
 def ajaxfun(request):