From cf85775b60d096583ec64a257e8a6afe47e21cd2 Mon Sep 17 00:00:00 2001 From: Kriti Godey Date: Tue, 2 Mar 2010 16:48:36 -0500 Subject: [PATCH] Login view works! Forms have been reshuffled (Django apparently comes with built in forms for authentication.) --- forms.py | 17 ++--------------- templates/allsandwiches.html | 2 +- templates/login.html | 11 +++++++++++ templates/onesandwich.html | 2 +- urls.py | 1 + views.py | 25 ++++++++++++++++++++++++- 6 files changed, 40 insertions(+), 18 deletions(-) create mode 100644 templates/login.html diff --git a/forms.py b/forms.py index e7d2728..cd81af2 100644 --- a/forms.py +++ b/forms.py @@ -1,6 +1,7 @@ from django.forms import ModelForm from models import Sandwich, Ingredient from django.contrib.auth.models import User +from django import forms class SandwichForm(ModelForm): @@ -14,18 +15,4 @@ class IngredientForm(ModelForm): class Meta: model = Ingredient - exclude = ('slug',) - - -class UserLoginForm(ModelForm): - - class Meta: - model = User - fields = ('username', 'password') - -class NewAccountForm(ModelForm): - - class Meta: - model = User - fields = ('username', 'first_name', 'last_name', 'email', 'password') - \ No newline at end of file + exclude = ('slug',) \ No newline at end of file diff --git a/templates/allsandwiches.html b/templates/allsandwiches.html index 64f734f..102f86c 100644 --- a/templates/allsandwiches.html +++ b/templates/allsandwiches.html @@ -6,7 +6,7 @@ {% for s in sandwiches %}

{{ s.adjective }}

Made on {{ s.date_made }} and added by {{ s.user.username }}.

- +
Ingredients