diff options
author | Mike Crute <mcrute@gmail.com> | 2012-12-30 19:56:10 -0500 |
---|---|---|
committer | Mike Crute <mcrute@gmail.com> | 2012-12-30 19:56:10 -0500 |
commit | 628876d6f84bca9287f03a2e143424cd8704637e (patch) | |
tree | a3039ae3ee5f6961279db776ec8908183e7606d2 | |
parent | dea70a8855cebe6d35eb8508ee150a79e87b8f45 (diff) | |
download | django-precompiler-628876d6f84bca9287f03a2e143424cd8704637e.tar.bz2 django-precompiler-628876d6f84bca9287f03a2e143424cd8704637e.tar.xz django-precompiler-628876d6f84bca9287f03a2e143424cd8704637e.zip |
-rw-r--r-- | proposals/models.py | 3 | ||||
-rw-r--r-- | proposals/urls.py | 2 | ||||
-rw-r--r-- | proposals/views.py | 6 | ||||
-rw-r--r-- | templates/proposals/proposal_form.html | 2 | ||||
-rw-r--r-- | templates/proposals/proposal_list.html | 25 |
5 files changed, 37 insertions, 1 deletions
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): | |||
50 | def for_user(self, user): | 50 | def for_user(self, user): |
51 | return self.get_query_set().filter(proposers=user) | 51 | return self.get_query_set().filter(proposers=user) |
52 | 52 | ||
53 | def approved(self): | ||
54 | return self.get_query_set().filter(approved=True) | ||
55 | |||
53 | 56 | ||
54 | class Proposal(models.Model): | 57 | class Proposal(models.Model): |
55 | 58 | ||
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 @@ | |||
1 | from django.conf.urls import patterns, include, url | 1 | from django.conf.urls import patterns, include, url |
2 | 2 | ||
3 | from proposals.views import ProposalListView | ||
3 | from proposals.views import ProposalUpdateView, ProposalCreationForm | 4 | from proposals.views import ProposalUpdateView, ProposalCreationForm |
4 | 5 | ||
5 | 6 | ||
6 | urlpatterns = patterns('proposals.views', | 7 | urlpatterns = patterns('proposals.views', |
7 | url(r'(?P<pk>[0-9]+)$', ProposalUpdateView.as_view(), name='update'), | 8 | url(r'(?P<pk>[0-9]+)$', ProposalUpdateView.as_view(), name='update'), |
8 | url(r'create/$', ProposalCreationForm.as_view(), name='create'), | 9 | url(r'create/$', ProposalCreationForm.as_view(), name='create'), |
10 | url(r'^$', ProposalListView.as_view(), name='home'), | ||
9 | ) | 11 | ) |
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 @@ | |||
1 | from django.shortcuts import resolve_url | 1 | from django.shortcuts import resolve_url |
2 | from django.views.generic import ListView | ||
2 | from django.views.generic.edit import CreateView, UpdateView | 3 | from django.views.generic.edit import CreateView, UpdateView |
3 | 4 | ||
4 | from proposals.models import Proposal | 5 | from proposals.models import Proposal |
5 | from proposals.forms import UserProposalForm | 6 | from proposals.forms import UserProposalForm |
6 | 7 | ||
7 | 8 | ||
9 | class ProposalListView(ListView): | ||
10 | |||
11 | queryset = Proposal.objects.approved() | ||
12 | |||
13 | |||
8 | class ProposalCreationForm(CreateView): | 14 | class ProposalCreationForm(CreateView): |
9 | 15 | ||
10 | model = Proposal | 16 | 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 @@ | |||
1 | {% extends "base.html" %} | 1 | {% extends "base.html" %} |
2 | 2 | ||
3 | {% block title %}CodeMash Sponsors{% endblock %} | 3 | {% block title %}CodeMash Talks{% endblock %} |
4 | 4 | ||
5 | {% block content %} | 5 | {% block content %} |
6 | <h1>{% if edit_view %}Edit{% else %}Submit{% endif %} Proposal</h1> | 6 | <h1>{% if edit_view %}Edit{% else %}Submit{% endif %} Proposal</h1> |
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 @@ | |||
1 | {% extends "base.html" %} | ||
2 | |||
3 | {% block title %}CodeMash Sessions{% endblock %} | ||
4 | |||
5 | {% block content %} | ||
6 | <h1>Sessions</h1> | ||
7 | <ul> | ||
8 | {% for proposal in object_list %} | ||
9 | <li> | ||
10 | <h2>{{ proposal.title }}</h2> | ||
11 | <p>{{ proposal.time_slot }}</p> | ||
12 | <p><b>Location:</b> {{ proposal.location }}</p> | ||
13 | <p><b>{{ proposal.category }}</b> {{ proposal.audience_skill_level }}</p> | ||
14 | <p><b>Presenters</b></p> | ||
15 | <ul> | ||
16 | {% for presenter in proposal.proposers.all %} | ||
17 | <li>{{ presenter.first_name }} {{ presenter.last_name }}</li> | ||
18 | {% endfor %} | ||
19 | </ul> | ||
20 | <p>{{ proposal.abstract }}</p> | ||
21 | <p>{{ proposal.outline }}</p> | ||
22 | </li> | ||
23 | {% endfor %} | ||
24 | </ul> | ||
25 | {% endblock %} | ||