Author: jtauber
Date: Mon Oct 13 03:47:34 2008
New Revision: 35
Modified:
trunk/bookmarks/models.py
trunk/bookmarks/urls.py
trunk/bookmarks/views.py
Log:
added ability to delete bookmark instances
Modified: trunk/bookmarks/models.py
==============================================================================
--- trunk/bookmarks/models.py (original)
+++ trunk/bookmarks/models.py Mon Oct 13 03:47:34 2008
@@ -84,5 +84,11 @@
self.bookmark = bookmark
super(BookmarkInstance, self).save(force_insert, force_update)
+ def delete(self):
+ bookmark = self.bookmark
+ super(BookmarkInstance, self).delete()
+ if bookmark.saved_instances.all().count() == 0:
+ bookmark.delete()
+
def __unicode__(self):
return _("%(bookmark)s for %(user)s") %
{'bookmark':self.bookmark, 'user':self.user}
Modified: trunk/bookmarks/urls.py
==============================================================================
--- trunk/bookmarks/urls.py (original)
+++ trunk/bookmarks/urls.py Mon Oct 13 03:47:34 2008
@@ -8,6 +8,7 @@
url(r'^$', 'bookmarks.views.bookmarks', name="all_bookmarks"),
url(r'^your_bookmarks/$', 'bookmarks.views.your_bookmarks',
name="your_bookmarks"),
url(r'^add/$', 'bookmarks.views.add', name="add_bookmark"),
+ url(r'^(\d+)/delete/$', 'bookmarks.views.delete',
name="delete_bookmark_instance"),
# for voting
(r'^(?P<object_id>\d+)/(?P<direction>up|down|clear)vote/?$',
Modified: trunk/bookmarks/views.py
==============================================================================
--- trunk/bookmarks/views.py (original)
+++ trunk/bookmarks/views.py Mon Oct 13 03:47:34 2008
@@ -88,3 +88,19 @@
"bookmarklet": bookmarklet,
"bookmark_form": bookmark_form,
}, context_instance=RequestContext(request))
+
[EMAIL PROTECTED]
+def delete(request, bookmark_instance_id):
+
+ bookmark_instance = get_object_or_404(BookmarkInstance,
id=bookmark_instance_id)
+ if request.user == bookmark_instance.user:
+ bookmark_instance.delete()
+ request.user.message_set.create(message="Bookmark Deleted")
+
+ if "next" in request.GET:
+ next = request.GET["next"]
+ else:
+ next = reverse("bookmarks.views.bookmarks")
+
+ return HttpResponseRedirect(next)
+
\ No newline at end of file
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"pinax-updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/pinax-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
