From: Kriti Godey <kriti.godey@gmail.com>
Date: Thu, 11 Mar 2010 21:49:54 +0000 (-0500)
Subject: add missing ingredients from the add sandwich form, static URLS replaced, and some... 
X-Git-Url: http://git.ithinksw.org/~kgodey/maayanwich.git/commitdiff_plain/1aa5c76d73037bf97e9832d0e5910ce9edae8195

add missing ingredients from the add sandwich form, static URLS replaced, and some redirects instead of success pages.
---

diff --git a/templates/base.html b/templates/base.html
index 0cfc3a7..dd6dc3e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 <html>
 	<head>
-		<link rel="stylesheet" href="http://127.0.0.1:8000/sandwiches/style.css" type="text/css">
+		<link rel="stylesheet" href="{{ media_url }}sandwiches/style.css" type="text/css">
 		<title>{% block title %}Ma'ayanwich Tracker{% endblock %}</title>
 		{% block extrahead %}{% endblock %}
 	</head>
diff --git a/templates/sandwich.html b/templates/sandwich.html
index 1b2b2fc..fd874b1 100644
--- a/templates/sandwich.html
+++ b/templates/sandwich.html
@@ -1,12 +1,12 @@
 {% extends "base.html" %}
 {% block extrahead %}
-<script type="text/javascript" src="http://127.0.0.1:8000/sandwiches/jquery-1.4.2.min.js"></script>
-<script type="text/javascript" src="http://127.0.0.1:8000/sandwiches/jquery.tokeninput.js"></script>
-<script type="text/javascript" src="http://127.0.0.1:8000/sandwiches/date.js"></script>
+<script type="text/javascript" src="{{ media_url }}sandwiches/jquery-1.4.2.min.js"></script>
+<script type="text/javascript" src="{{ media_url }}sandwiches/jquery.tokeninput.js"></script>
+<script type="text/javascript" src="{{ media_url }}sandwiches/date.js"></script>
 <!--[if IE]><script type="text/javascript" src="http://127.0.0.1:8000/sandwiches/jquery.bgiframe.js"></script><![endif]-->
-<script type="text/javascript" src="http://127.0.0.1:8000/sandwiches/jquery.datePicker.js"></script>
-<link rel="stylesheet" href="http://127.0.0.1:8000/sandwiches/token-input.css" type="text/css" />
-<link rel="stylesheet" href="http://127.0.0.1:8000/sandwiches/datePicker.css" type="text/css" />
+<script type="text/javascript" src="{{ media_url }}sandwiches/jquery.datePicker.js"></script>
+<link rel="stylesheet" href="{{ media_url }}sandwiches/token-input.css" type="text/css" />
+<link rel="stylesheet" href="{{ media_url }}sandwiches/datePicker.css" type="text/css" />
 <script type="text/javascript">
 $(document).ready(function () {
   $("#id_ing").tokenInput("/ajaxfun/", {
diff --git a/views.py b/views.py
index 51be20d..38556df 100644
--- a/views.py
+++ b/views.py
@@ -1,4 +1,4 @@
-from django.http import HttpResponse, Http404
+from django.http import HttpResponse, Http404, HttpResponseRedirect
 from django.contrib.auth.models import User
 from forms import SandwichForm, IngredientForm, NewUserForm
 from django.shortcuts import render_to_response
@@ -8,8 +8,11 @@ from django.contrib.auth import authenticate, login, logout
 from django.contrib.auth.forms import AuthenticationForm
 from django.template import RequestContext
 from django.core import serializers
+from slugify import SlugifyUniquely
+from recipes.settings import MEDIA_URL
 import datetime
 import django.utils.simplejson as json
+from django.core.urlresolvers import reverse
 
 def sidebar_context(request):
 	x = Sandwich.objects.order_by('-date_made')
@@ -18,7 +21,7 @@ def sidebar_context(request):
 	else:
 		sandwiches = x
 	monthly = Sandwich.objects.dates('date_made', 'month')
-	return {'sandwiches': sandwiches, 'monthly': monthly, 'user': request.user}
+	return {'sandwiches': sandwiches, 'monthly': monthly, 'user': request.user, 'media_url': MEDIA_URL }
 
 
 def add_sandwich(request):
@@ -35,15 +38,18 @@ def add_sandwich(request):
 				for n in y:
 					if n.isdigit():
 						newsandwich.ingredients.add(Ingredient.objects.get(id=n))
+					else:
+						n = n.lstrip('new:')
+						newingredient = Ingredient(name=n, slug=SlugifyUniquely(n, Ingredient))
+						newingredient.save()
+						newsandwich.ingredients.add(newingredient)
 				newsandwich.save()
-				thankshtml = "<p class=\"formthanks\">Thanks! Your sandwich has been added!</p>"
-				return HttpResponse(thankshtml) # Redirect after POST
+				return HttpResponseRedirect(newsandwich.get_absolute_url())
 		else:
 			form = SandwichForm(initial={'user': request.user}) # An unbound form
 		return render_to_response('sandwich.html', {'sform': form,}, context_instance=RequestContext(request))
 	else:
-		thankshtml = "<p class=\"formthanks\">You are not logged in.</p>"
-		return HttpResponse(thankshtml) # Redirect after POST
+		return HttpResponseRedirect(reverse('login'))
 
 def add_ingredient(request):
 	if request.user.is_authenticated():
@@ -100,16 +106,20 @@ def specific_sandwich(request, slug):
 	return render_to_response('onesandwich.html', {'s': s,}, context_instance=RequestContext(request))
 
 def logout_view(request):
+	x = reverse('index')
+	if 'HTTP_REFERER' in request.META:
+		x = request.META['HTTP_REFERER']
 	if request.user.is_authenticated():
 		logout(request)
-		thankshtml = "<p class=\"formthanks\">You have been logged out.</p>"
-		return HttpResponse(thankshtml)
+		return HttpResponseRedirect(x)
 	else:
-		thankshtml = "<p class=\"formthanks\">You are not logged in.</p>"
-		return HttpResponse(thankshtml)
+		return HttpResponseRedirect(x)
 
 
 def login_view(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:
@@ -121,14 +131,11 @@ def login_view(request):
 		if user is not None:
 			if user.is_active:
 				login(request, user)
-				thankshtml = "<p class=\"formthanks\">You have been logged in</p>"
-				return HttpResponse(thankshtml)
+				return HttpResponseRedirect(x)
 			else:
-				thankshtml = "<p class=\"formthanks\">Disabled account. Sorry.</p>"
-				return HttpResponse(thankshtml)
+				return HttpResponseRedirect(x)
 		else:
-			thankshtml = "<p class=\"formthanks\">Invalid login!</p>"
-			return HttpResponse(thankshtml)
+			return HttpResponseRedirect('login')
 	except KeyError:
 		aform = AuthenticationForm()
 		return render_to_response('login.html', {'aform': aform,}, context_instance=RequestContext(request))
@@ -140,8 +147,7 @@ def create_user(request):
 	else:
 		sandwiches = Sandwich.objects.order_by('-date_made')
 	if request.user.is_authenticated():
-		thankshtml = "<p class=\"formthanks\">You are already logged in!</p>"
-		return HttpResponse(thankshtml)
+		return HttpResponseRedirect('index')
 	elif request.method == 'POST': # If the form has been submitted...
 		form = NewUserForm(request.POST) # A form bound to the POST data
 		if form.is_valid(): # All validation rules pass
@@ -157,11 +163,9 @@ def create_user(request):
 				user.first_name = first_name
 				user.last_name = last_name
 				user.save()
-				thankshtml = "<p class=\"formthanks\">Thanks! You are now a new user!</p>"
-				return HttpResponse(thankshtml) # Redirect after POST
+				return HttpResponseRedirect('index')
 			else:
-				thankshtml = "<p class=\"formthanks\">Your passwords don't match!</p>"
-				return HttpResponse(thankshtml) # Redirect after POST	
+				return HttpResponseRedirect('signup')	
 	else:
 		form = NewUserForm() # An unbound form
 		return render_to_response('newuser.html', {'cform': form,}, context_instance=RequestContext(request))
@@ -173,8 +177,13 @@ def ajaxfun(request):
 			query = request.GET['q']
 			ingredients = Ingredient.objects.filter(name__icontains=query).order_by('name')
 			responselist = []
+			is_in = False
 			for i in ingredients:
 				responselist.append({'id': str(i.pk), 'name': i.name})
+				if i.name == query:
+					is_in = True
+			if is_in == False:
+				responselist.append({'id': 'new:' + query, 'name': query})
 			response = json.dumps(responselist)
 			return HttpResponse(response)
 		else:
