diff options
Diffstat (limited to 'proposals')
-rw-r--r-- | proposals/models.py | 3 | ||||
-rw-r--r-- | proposals/urls.py | 2 | ||||
-rw-r--r-- | proposals/views.py | 6 |
3 files changed, 11 insertions, 0 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 |