From 5f08e951974fc1713d79a734897b1eebe3e07888 Mon Sep 17 00:00:00 2001
From: Eric Holscher <eric@ericholscher.com>
Date: Sun, 15 Aug 2010 19:36:45 +0000
Subject: [PATCH] Added bookmarks to dashboard urls

---
 bookmarks/views.py | 12 +++++++-----
 builds/views.py    |  4 +---
 urls.py            |  4 ++++
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/bookmarks/views.py b/bookmarks/views.py
index 1de2bfe12..a165a973e 100644
--- a/bookmarks/views.py
+++ b/bookmarks/views.py
@@ -6,17 +6,19 @@ from django.views.generic.list_detail import object_list
 from bookmarks.models import Bookmark
 from projects.models import Project
 
-@login_required
-def bookmark_list(request):
-    queryset = Bookmark.objects.all()
-    queryset = queryset.filter(user=request.user)
-
+def bookmark_list(request, queryset=Bookmark.objects.all()):
     return object_list(
         request,
         queryset=queryset,
         template_object_name='bookmark',
     )
 
+@login_required
+def user_bookmark_list(request):
+    queryset = Bookmark.objects.all()
+    queryset = queryset.filter(user=request.user)
+    return bookmark_list(request, queryset=queryset)
+
 @login_required
 def bookmark_add(request, url):
     bookmark = Bookmark.objects.create(user=request.user, url=url)
diff --git a/builds/views.py b/builds/views.py
index 9a3bc03bb..7a5af92b3 100644
--- a/builds/views.py
+++ b/builds/views.py
@@ -1,5 +1,3 @@
-import simplejson
-
 from django.contrib.auth.models import User
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import get_object_or_404
@@ -8,7 +6,7 @@ from django.views.generic.list_detail import object_list, object_detail
 from builds.models import Build
 from projects.models import Project
 
-from taggit.models import Tag, TaggedItem
+from taggit.models import Tag
 
 def build_list(request, username=None, project_slug=None, tag=None):
     queryset = Build.objects.all()
diff --git a/urls.py b/urls.py
index dc8c2dc3f..d1d6dc179 100644
--- a/urls.py
+++ b/urls.py
@@ -10,6 +10,10 @@ urlpatterns = patterns('',
     url(r'^builds/', include('builds.urls')),
     url(r'^bookmarks/', include('bookmarks.urls')),
     url(r'^accounts/', include('registration.backends.default.urls')),
+    url(r'^dashboard/bookmarks/',
+        'bookmarks.views.user_bookmark_list',
+        name='user_bookmarks'
+    ),
     url(r'^dashboard/', include('projects.urls.private')),