From 628876d6f84bca9287f03a2e143424cd8704637e Mon Sep 17 00:00:00 2001 From: Mike Crute Date: Sun, 30 Dec 2012 19:56:10 -0500 Subject: WIP --- proposals/models.py | 3 +++ proposals/urls.py | 2 ++ proposals/views.py | 6 ++++++ templates/proposals/proposal_form.html | 2 +- templates/proposals/proposal_list.html | 25 +++++++++++++++++++++++++ 5 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 templates/proposals/proposal_list.html diff --git a/proposals/models.py b/proposals/models.py index 8551659..e7b32d8 100644 --- a/proposals/models.py +++ b/proposals/models.py @@ -50,6 +50,9 @@ class ProposalManager(models.Manager): def for_user(self, user): return self.get_query_set().filter(proposers=user) + def approved(self): + return self.get_query_set().filter(approved=True) + class Proposal(models.Model): diff --git a/proposals/urls.py b/proposals/urls.py index 5a33b6f..b63af24 100644 --- a/proposals/urls.py +++ b/proposals/urls.py @@ -1,9 +1,11 @@ from django.conf.urls import patterns, include, url +from proposals.views import ProposalListView from proposals.views import ProposalUpdateView, ProposalCreationForm urlpatterns = patterns('proposals.views', url(r'(?P[0-9]+)$', ProposalUpdateView.as_view(), name='update'), url(r'create/$', ProposalCreationForm.as_view(), name='create'), + url(r'^$', ProposalListView.as_view(), name='home'), ) diff --git a/proposals/views.py b/proposals/views.py index aacba55..122ddc1 100644 --- a/proposals/views.py +++ b/proposals/views.py @@ -1,10 +1,16 @@ from django.shortcuts import resolve_url +from django.views.generic import ListView from django.views.generic.edit import CreateView, UpdateView from proposals.models import Proposal from proposals.forms import UserProposalForm +class ProposalListView(ListView): + + queryset = Proposal.objects.approved() + + class ProposalCreationForm(CreateView): model = Proposal diff --git a/templates/proposals/proposal_form.html b/templates/proposals/proposal_form.html index 79f33bf..40e11b4 100644 --- a/templates/proposals/proposal_form.html +++ b/templates/proposals/proposal_form.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}CodeMash Sponsors{% endblock %} +{% block title %}CodeMash Talks{% endblock %} {% block content %}

{% if edit_view %}Edit{% else %}Submit{% endif %} Proposal

diff --git a/templates/proposals/proposal_list.html b/templates/proposals/proposal_list.html new file mode 100644 index 0000000..4dcac39 --- /dev/null +++ b/templates/proposals/proposal_list.html @@ -0,0 +1,25 @@ +{% extends "base.html" %} + +{% block title %}CodeMash Sessions{% endblock %} + +{% block content %} +

Sessions

+ +{% endblock %} -- cgit v1.2.3