@@ -140,6 +140,58 @@ def entry_comment(request, entry): } return render_to_response('comment.html', extra_context, context_instance=RequestContext(request)) +def entry_delete(request, entry): + '''Delete an entry. + + Authentcation is required. + + entry is the entry id. + ''' + if not request.session.get('nickname', None): + return HttpResponseRedirect(reverse('login')) + f = friendfeed.FriendFeed(request.session['nickname'], + request.session['key']) + try: + f.delete_entry(entry) + except Exception, e: + if e[0] == 401: + del request.session['nickname'] + del request.session['key'] + return HttpResponseRedirect(reverse(str(e))) + next = request.GET.get('next', '/') + if '?' in next: + next = next + '&message=deleted&entry=%s' % entry + else: + next = next + '?message=deleted&entry=%s' % entry + next = next + '#%s' % entry + return HttpResponseRedirect(next) + +def entry_undelete(request, entry): + '''Un-delete an entry. + + Authentcation is required. + + entry is the entry id. + ''' + if not request.session.get('nickname', None): + return HttpResponseRedirect(reverse('login')) + f = friendfeed.FriendFeed(request.session['nickname'], + request.session['key']) + try: + f.undelete_entry(entry) + except Exception, e: + if e[0] == 401: + del request.session['nickname'] + del request.session['key'] + return HttpResponseRedirect(reverse(str(e))) + next = request.GET.get('next', '/') + if '?' in next: + next = next + '&message=shared&entry=%s' % entry + else: + next = next + '?message=shared&entry=%s' % entry + next = next + '#%s' % entry + return HttpResponseRedirect(next) + def entry_hide(request, entry): '''Hide an entry. @@ -521,9 +573,9 @@ def share(request): return HttpResponseRedirect(reverse(str(e))) next = request.POST.get('next', '/') if '?' in next: - next = next + '&message=created' + next = next + '&message=shared&entry=%s' % entry['id'] else: - next = next + '?message=created' + next = next + '?message=shared&entry=%s' % entry['id'] next += '#%s' % entry['id'] return HttpResponseRedirect(next) fftogo/views.py @@ -15,13 +15,21 @@ {% ifequal request.message 'settings' %} Did you know that you can <a href="{% url settings %}">change your font size and other settings</a>? {% endifequal %} - {% ifequal request.message 'created' %} + {% ifequal request.message 'shared' %} Entry created + - + <a href="{% url entry_delete request.entry %}"?next={{ request.path }}">Undo</a> {% endifequal %} {% ifequal request.message 'deleted' %} - Comment deleted - - - <a href="{% url comment_undelete request.entry,request.comment %}?next={{ request.path }}">Undo</a> + {% if request.comment %} + Comment deleted + - + <a href="{% url comment_undelete request.entry,request.comment %}?next={{ request.path }}">Undo</a> + {% else %} + Entry deleted + - + <a href="{% url entry_undelete request.entry %}"?next={{ request.path }}">Undo</a> + {% endif %} {% endifequal %} {% ifequal request.message 'commented' %} Comment created @@ -123,6 +131,10 @@ <a href="{% url entry_hide entry.id %}?next={{ request.path }}">Hide</a> {% endifnotequal %} {% endif %} + {% ifequal entry.user.nickname request.session.nickname %} + - + <a href="{% url entry_delete entry.id %}?next={{ request.path }}">Delete</a> + {% endifequal %} {% endif %} {% if entry.likes %} - templates/entries.html @@ -20,6 +20,8 @@ urlpatterns = patterns('', url(r'^(?P<nickname>\w+)/$', 'fftogo.views.user', name='user'), url(r'^(?P<nickname>\w+)/(?P<type>\w+)/$', 'fftogo.views.user', name='user_type'), url(r'^e/(?P<entry>[\w-]+)/comment/$', 'fftogo.views.entry_comment', name='entry_comment'), + url(r'^e/(?P<entry>[\w-]+)/delete/$', 'fftogo.views.entry_delete', name='entry_delete'), + url(r'^e/(?P<entry>[\w-]+)/undelete/$', 'fftogo.views.entry_undelete', name='entry_undelete'), url(r'^e/(?P<entry>[\w-]+)/c/(?P<comment>[\w-]+)/delete/$', 'fftogo.views.comment_delete', name='comment_delete'), url(r'^e/(?P<entry>[\w-]+)/c/(?P<comment>[\w-]+)/undelete/$', 'fftogo.views.comment_undelete', name='comment_undelete'), url(r'^e/(?P<entry>[\w-]+)/like/$', 'fftogo.views.entry_like', name='entry_like'), urls.py c97ab89a78236db7a6d557b2c66a57c33e1e2aef Benjamin Golub bgolub@benjamingolub.com http://github.com/bgolub/fftogo/commit/e52bee0e568b614c89f938e22a04cbed8fe61c82 e52bee0e568b614c89f938e22a04cbed8fe61c82 2008-07-07T09:53:32-07:00 2008-07-07T09:53:32-07:00 entry delete/undelete 4673f895ffd411158c54758a738d903b57b712f6 Benjamin Golub bgolub@benjamingolub.com