jpt-archive/django-brainstorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

working with the new labs site

Browse Source
This commit is contained in:
James Turk 2009-08-19 13:49:19 -04:00
parent f3cfc80f15
commit ca6062f5af
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
brainstorm/models.py
View File

@ -60,7 +60,7 @@ class Idea(models.Model):
return self.title
def get_absolute_url(self):
return reverse('idea', args=[self.subsite_id, self.id])
return reverse('idea_detail', args=[self.subsite_id, self.id])
class Vote(models.Model):
user = models.ForeignKey(User, related_name='idea_votes')

7
brainstorm/views.py
View File

@ -14,14 +14,15 @@ from brainstorm.models import Subsite, Idea, Vote
def idea_list(request, slug, ordering='-total_upvotes'):
ordering_db = {'most_popular': '-score',
'latest': '-submit_date'}[ordering]
return list_detail.object_list(request,
queryset=Idea.objects.filter(subsite__slug=slug).with_user_vote(request.user).select_related().order_by(ordering_db),
qs = Idea.objects.with_user_vote(request.user).filter(subsite__slug=slug).select_related().order_by(ordering_db)
#print qs
return list_detail.object_list(request, queryset=qs,
extra_context={'ordering': ordering, 'subsite':slug}, paginate_by=10,
template_object_name='idea')
def idea_detail(request, slug, id):
idea = get_object_or_404(Idea.objects.with_user_vote(request.user), pk=id, subsite__slug=slug)
return render_to_response('ideas/idea_detail.html',
return render_to_response('brainstorm/idea_detail.html',
{'idea': idea},
context_instance=RequestContext(request))