Merge pull request #1130 from kawazrepos/fix-500-on-event-deletion

Fix 500 error when users attempt to delete entries

src/kawaz/apps/blogs/tests/views/test_crud.py

@@ -470,3 +470,33 @@ def test_category_list(self):
         self.assertTrue(entry2 in r.context['object_list'])
 
         self.assertTrue('author' in r.context)
+
+
+class EntryDeleteViewTestCase(TestCase):
+    def setUp(self):
+        self.user = PersonaFactory(username='author_kawaztan')
+        self.user.set_password('password')
+        self.other = PersonaFactory(username='black_kawaztan')
+        self.user.save()
+        self.other.save()
+        self.entry = EntryFactory(title='かわずたんだよ☆', author=self.user)
+
+    def test_anonymous_user_can_not_delete_via_delete_view(self):
+        '''非ログインユーザーは記事の削除ができない'''
+        r = self.client.post('/blogs/author_kawaztan/1/delete/')
+        self.assertRedirects(r, settings.LOGIN_URL + '?next=/blogs/author_kawaztan/1/delete/')
+        self.assertEqual(self.entry.title, 'かわずたんだよ☆')
+
+    def test_other_user_cannot_delete_via_delete_view(self):
+        '''作者以外のユーザーは記事の削除ができない'''
+        self.assertTrue(self.client.login(username=self.other, password='password'))
+        r = self.client.post('/blogs/author_kawaztan/1/delete/')
+        self.assertRedirects(r, settings.LOGIN_URL + '?next=/blogs/author_kawaztan/1/delete/')
+        self.assertEqual(self.entry.title, 'かわずたんだよ☆')
+
+    def test_author_can_delete_via_delete_view(self):
+        '''作者は記事を削除できる'''
+        self.assertTrue(self.client.login(username=self.user, password='password'))
+        r = self.client.post('/blogs/author_kawaztan/1/delete/')
+        self.assertRedirects(r, '/blogs/')
+        self.assertEqual(Entry.objects.count(), 0)

src/kawaz/apps/blogs/views.py

@@ -8,6 +8,7 @@
 from django.views.generic import MonthArchiveView
 from django.views.generic import YearArchiveView
 from django.views.generic.dates import MultipleObjectMixin
+from django.core.urlresolvers import reverse_lazy
 from django.contrib.messages.views import SuccessMessageMixin
 from django.shortcuts import get_object_or_404
 from django.utils.translation import ugettext as _
@@ -85,6 +86,7 @@ def get_success_message(self, cleaned_data):
 @permission_required('blogs.delete_entry')
 class EntryDeleteView(DeleteSuccessMessageMixin, DeleteView):
     model = Entry
+    success_url = reverse_lazy('blogs_entry_list')
 
     def get_success_message(self):
         return _("The blog entry was successfully deleted.")