Remove update and create post views.

Author: tim-schilling

project/newsletter/test_views.py

@@ -1,12 +1,10 @@
 from datetime import timedelta
-from io import BytesIO
 from unittest.mock import patch
 
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.urls import reverse
 from django.utils import timezone
-from PIL import Image
 
 from project.newsletter.models import Post, Subscription, SubscriptionNotification
 from project.newsletter.test import DataTestCase
@@ -208,78 +206,6 @@ def test_pagination(self):
         )
 
 
-class TestUpdatePost(DataTestCase):
-    def test_staff_user_required(self):
-        user = User.objects.create_user(username="basic")
-        self.client.force_login(user)
-        url = reverse(
-            "newsletter:update_post", kwargs={"slug": self.data.private_post.slug}
-        )
-        response = self.client.post(url)
-        self.assertRedirects(response, f"{settings.LOGIN_URL}?next={url}")
-
-    def test_get(self):
-        self.client.force_login(self.user)
-        url = reverse(
-            "newsletter:update_post", kwargs={"slug": self.data.private_post.slug}
-        )
-        response = self.client.get(url)
-        self.assertTemplateUsed(response, "staff/post_form.html")
-
-    def test_invalid(self):
-        self.client.force_login(self.user)
-        url = reverse(
-            "newsletter:update_post", kwargs={"slug": self.data.private_post.slug}
-        )
-        response = self.client.post(url, data={})
-        self.assertTemplateUsed(response, "staff/post_form.html")
-        self.assertInHTML(
-            "<li>This field is required.</li>",
-            response.content.decode("utf-8"),
-        )
-
-    def test_update(self):
-        post = Post.objects.create(
-            author=self.data.author,
-            title="Test Update",
-            slug="test-update",
-            content="c",
-        )
-        self.client.force_login(self.user)
-
-        img = BytesIO()
-        Image.new("RGB", (1, 1), "#FF0000").save(img, format="PNG")
-        img.name = "myimage.png"
-        img.seek(0)
-        data = {
-            "title": "Test Update2",
-            "slug": "test-update2",
-            "categories": [self.data.career.id],
-            "content": "content",
-            "summary": "summary",
-            "is_public": False,
-            "is_published": True,
-            "open_graph_description": "description",
-            "open_graph_image": img,
-        }
-        response = self.client.post(
-            reverse("newsletter:update_post", kwargs={"slug": post.slug}), data=data
-        )
-        self.assertRedirects(
-            response, reverse("newsletter:update_post", kwargs={"slug": "test-update2"})
-        )
-        post.refresh_from_db()
-        self.assertEqual(post.slug, "test-update2")
-        self.assertEqual(post.title, "Test Update2")
-        self.assertEqual(post.categories.get(), self.data.career)
-        self.assertEqual(post.content, "content")
-        self.assertEqual(post.summary, "summary")
-        self.assertEqual(post.open_graph_description, "description")
-        self.assertFalse(post.is_public)
-        self.assertTrue(post.is_published)
-        self.assertIsNotNone(post.open_graph_image.file)
-
-
 class TestTogglePostPrivacy(DataTestCase):
     def test_staff_user_required(self):
         user = User.objects.create_user(username="basic")
@@ -314,74 +240,12 @@ def test_toggle(self):
         self.assertFalse(post.is_public)
 
         # Toggle the property back and verify the redirect to next.
-        response = self.client.post(
-            url
-            + f"?next={reverse('newsletter:update_post', kwargs={'slug': post.slug})}"
-        )
-        self.assertRedirects(
-            response, reverse("newsletter:update_post", kwargs={"slug": post.slug})
-        )
+        response = self.client.post(url + f"?next={reverse('newsletter:landing')}")
+        self.assertRedirects(response, reverse("newsletter:landing"))
         post.refresh_from_db()
         self.assertTrue(post.is_public)
 
 
-class TestCreatePost(DataTestCase):
-    def test_staff_user_required(self):
-        user = User.objects.create_user(username="basic")
-        self.client.force_login(user)
-        url = reverse("newsletter:create_post")
-        response = self.client.post(url)
-        self.assertRedirects(response, f"{settings.LOGIN_URL}?next={url}")
-
-    def test_get(self):
-        self.client.force_login(self.user)
-        url = reverse("newsletter:create_post")
-        response = self.client.get(url)
-        self.assertTemplateUsed(response, "staff/post_form.html")
-
-    def test_invalid(self):
-        self.client.force_login(self.user)
-        response = self.client.post(reverse("newsletter:create_post"), data={})
-        self.assertTemplateUsed(response, "staff/post_form.html")
-        self.assertInHTML(
-            "<li>This field is required.</li>",
-            response.content.decode("utf-8"),
-        )
-
-    def test_create(self):
-        self.client.force_login(self.user)
-
-        img = BytesIO()
-        Image.new("RGB", (1, 1), "#FF0000").save(img, format="PNG")
-        img.name = "myimage.png"
-        img.seek(0)
-        data = {
-            "title": "Test Create",
-            "slug": "test-create",
-            "categories": [self.data.career.id],
-            "content": "content",
-            "summary": "summary",
-            "is_public": False,
-            "is_published": True,
-            "open_graph_description": "description",
-            "open_graph_image": img,
-        }
-        response = self.client.post(reverse("newsletter:create_post"), data=data)
-
-        self.assertRedirects(
-            response, reverse("newsletter:update_post", kwargs={"slug": "test-create"})
-        )
-        post = Post.objects.get(slug="test-create")
-        self.assertEqual(post.title, "Test Create")
-        self.assertEqual(post.categories.get(), self.data.career)
-        self.assertEqual(post.content, "content")
-        self.assertEqual(post.summary, "summary")
-        self.assertEqual(post.open_graph_description, "description")
-        self.assertFalse(post.is_public)
-        self.assertTrue(post.is_published)
-        self.assertIsNotNone(post.open_graph_image.file)
-
-
 class TestUpdateSubscription(DataTestCase):
     def setUp(self) -> None:
         super().setUp()

project/newsletter/urls.py

@@ -9,8 +9,6 @@
     path("account/", views.update_subscription, name="update_subscription"),
     path("analytics/", views.analytics, name="analytics"),
     path("post/unpublished/", views.unpublished_posts, name="unpublished_posts"),
-    path("post/create/", views.create_post, name="create_post"),
-    path("post/<slug>/update/", views.update_post, name="update_post"),
     path(
         "post/<slug>/toggle_privacy/",
         views.toggle_post_privacy,

project/newsletter/views.py

@@ -19,7 +19,7 @@
 from martor.utils import LazyEncoder
 
 from project.newsletter import operations
-from project.newsletter.forms import PostForm, SubscriptionForm
+from project.newsletter.forms import SubscriptionForm
 from project.newsletter.models import Category, Post, Subscription
 
 LIST_POSTS_PAGE_SIZE = 100
@@ -129,41 +129,6 @@ def unpublished_posts(request):
     )
 
 
-@staff_member_required(login_url=settings.LOGIN_URL)
-@require_http_methods(["GET", "POST"])
-def create_post(request):
-    """
-    Staff create post view
-    """
-    form = PostForm()
-    if request.method == "POST":
-        form = PostForm(request.POST, files=request.FILES)
-        if form.is_valid():
-            form.instance.author = request.user
-            post = form.save()
-            messages.success(request, f"Post '{post.title}' was created successfully.")
-            return redirect("newsletter:update_post", slug=post.slug)
-    return render(request, "staff/post_form.html", {"form": form, "post": None})
-
-
-@staff_member_required(login_url=settings.LOGIN_URL)
-@require_http_methods(["GET", "POST"])
-def update_post(request, slug):
-    """
-    Staff update post view
-    """
-    post = get_object_or_404(Post, slug=slug)
-    form = PostForm(instance=post)
-    if request.method == "POST":
-        form = PostForm(request.POST, instance=post, files=request.FILES)
-        if form.is_valid():
-            form.instance.author = request.user
-            post = form.save()
-            messages.success(request, f"Post '{post.title}' was updated successfully.")
-            return redirect("newsletter:update_post", slug=post.slug)
-    return render(request, "staff/post_form.html", {"form": form, "post": post})
-
-
 @staff_member_required(login_url=settings.LOGIN_URL)
 @require_http_methods(["POST"])
 def toggle_post_privacy(request, slug):

project/templates/base.html

@@ -25,8 +25,6 @@
             <div class="menu transition hidden" tabindex="-1">
               <a href="{% url "newsletter:list_posts" %}" class="item">Published</a>
               <a href="{% url "newsletter:unpublished_posts" %}" class="item">Unpublished</a>
-              <div class="divider"></div>
-              <a href="{% url "newsletter:create_post" %}" class="item">Create</a>
             </div>
           </div>
         {% endif %}

project/templates/posts/detail.html

@@ -27,12 +27,7 @@
       {% else %}
         {{ post.title }}
       {% endif %}
-
     </div>
-    {% if request.user.is_staff %}
-      <div class="divider"> / </div>
-      <a href="{% url "newsletter:update_post" slug=post.slug %}" class="section">Edit</a>
-    {% endif %}
   </div>
   <p>
     Posted {{ post.publish_date|naturaltime }}

project/templates/posts/includes/list_item.html

@@ -22,15 +22,4 @@ <h3 class="ui header">{{ post.title }}</h3>
   <div class="left floated six wide column">
     <a href="{{ post.get_absolute_url }}" class="ui large button">Read More</a>
   </div>
-  {% if request.user.is_staff %}
-    <div class="right floated six wide column">
-      <form action="{% url "newsletter:toggle_post_privacy" slug=post.slug %}?next={{ request.path }}" method="post">
-        {% csrf_token %}
-        <div class="ui buttons">
-          <a href="{% url "newsletter:update_post" slug=post.slug %}" class="ui basic compact button">Edit</a>
-          <button class="ui basic compact button" type="submit">Set to {% if post.is_public %}private{% else %}public{% endif %}</button>
-        </div>
-      </form>
-    </div>
-  {% endif %}
 </div>