Replace ckeditor with tinymce due to deprecation

ram/bookshelf/migrations/0001_initial.py

@@ -1,7 +1,6 @@
 # Generated by Django 4.2.5 on 2023-10-01 20:16
 
-# ckeditor removal
+import ckeditor_uploader.fields
-# import ckeditor_uploader.fields
 from django.db import migrations, models
 import django.db.models.deletion
 import uuid
@@ -48,8 +47,7 @@ class Migration(migrations.Migration):
                 ("ISBN", models.CharField(max_length=13, unique=True)),
                 ("publication_year", models.SmallIntegerField(blank=True, null=True)),
                 ("purchase_date", models.DateField(blank=True, null=True)),
-                # ("notes", ckeditor_uploader.fields.RichTextUploadingField(blank=True)),
+                ("notes", ckeditor_uploader.fields.RichTextUploadingField(blank=True)),
-                ("notes", models.TextField(blank=True)),
                 ("creation_time", models.DateTimeField(auto_now_add=True)),
                 ("updated_time", models.DateTimeField(auto_now=True)),
                 ("authors", models.ManyToManyField(to="bookshelf.author")),

ram/consist/migrations/0005_alter_consist_notes.py

@@ -1,7 +1,6 @@
 # Generated by Django 4.1 on 2022-08-23 15:54
 
-# ckeditor removal
+import ckeditor_uploader.fields
-# import ckeditor_uploader.fields
 from django.db import migrations
 
 
@@ -12,9 +11,9 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        # migrations.AlterField(
+        migrations.AlterField(
-        #     model_name="consist",
+            model_name="consist",
-        #     name="notes",
+            name="notes",
-        #     field=ckeditor_uploader.fields.RichTextUploadingField(blank=True),
+            field=ckeditor_uploader.fields.RichTextUploadingField(blank=True),
-        # ),
+        ),
     ]

ram/portal/migrations/0011_alter_flatpage_content_alter_siteconfiguration_about_and_more.py

@@ -1,8 +1,7 @@
 # Generated by Django 4.1 on 2022-08-23 15:54
 
-# ckeditor dependency removal
+import ckeditor.fields
-# import ckeditor.fields
+import ckeditor_uploader.fields
-# import ckeditor_uploader.fields
 from django.db import migrations
 
 
@@ -13,24 +12,24 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-#         migrations.AlterField(
+        migrations.AlterField(
-#             model_name="flatpage",
+            model_name="flatpage",
-#             name="content",
+            name="content",
-#             field=ckeditor_uploader.fields.RichTextUploadingField(),
+            field=ckeditor_uploader.fields.RichTextUploadingField(),
-#         ),
+        ),
-#         migrations.AlterField(
+        migrations.AlterField(
-#             model_name="siteconfiguration",
+            model_name="siteconfiguration",
-#             name="about",
+            name="about",
-#             field=ckeditor.fields.RichTextField(blank=True),
+            field=ckeditor.fields.RichTextField(blank=True),
-#         ),
+        ),
-#         migrations.AlterField(
+        migrations.AlterField(
-#             model_name="siteconfiguration",
+            model_name="siteconfiguration",
-#             name="footer",
+            name="footer",
-#             field=ckeditor.fields.RichTextField(blank=True),
+            field=ckeditor.fields.RichTextField(blank=True),
-#         ),
+        ),
-#         migrations.AlterField(
+        migrations.AlterField(
-#             model_name="siteconfiguration",
+            model_name="siteconfiguration",
-#             name="footer_extended",
+            name="footer_extended",
-#             field=ckeditor.fields.RichTextField(blank=True),
+            field=ckeditor.fields.RichTextField(blank=True),
-#         ),
+        ),
     ]

ram/ram/urls.py

@@ -13,7 +13,6 @@ Including another URLconf
     1. Import the include() function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
-
 from django.apps import apps
 from django.conf import settings
 from django.shortcuts import redirect
@@ -25,8 +24,12 @@ from ram.views import UploadImage
 
 urlpatterns = [
     path("", lambda r: redirect("portal/")),
-    path("tinymce/", include("tinymce.urls")),
+    path('tinymce/', include('tinymce.urls')),
-    path("tinymce/upload_image", UploadImage.as_view(), name="upload_image"),
+    path(
+        "tinymce/upload_image",
+        UploadImage.as_view(),
+        name="upload_image"
+    ),
     path("portal/", include("portal.urls")),
     path("admin/", admin.site.urls),
     path("api/v1/consist/", include("consist.urls")),

ram/ram/views.py

@@ -8,29 +8,29 @@ from PIL import Image, UnidentifiedImageError
 from django.views import View
 from django.conf import settings
 from django.http import (
-    HttpResponseBadRequest,
+    JsonResponse, HttpResponseForbidden, HttpResponse
-    HttpResponseForbidden,
-    JsonResponse,
 )
 from django.utils.text import slugify as slugify
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 
 
-@method_decorator(csrf_exempt, name="dispatch")
+@method_decorator(csrf_exempt, name='dispatch')
 class UploadImage(View):
-    def post(self, request):
+    def post(self, request, application=None, model=None):
         if not request.user.is_authenticated:
             raise HttpResponseForbidden()
 
-        file_obj = request.FILES["file"]
+        file_obj = request.FILES['file']
         file_name, file_extension = os.path.splitext(file_obj.name)
         file_name = slugify(file_name) + file_extension
 
         try:
             Image.open(file_obj)
         except UnidentifiedImageError:
-            return HttpResponseBadRequest()
+            response = HttpResponse("Invalid extension")  # FIXME
+            response.status_code = 400
+            return response
 
         today = datetime.date.today()
         container = (
@@ -40,23 +40,20 @@ class UploadImage(View):
             today.strftime("%d"),
         )
 
-        dir_path = os.path.join(settings.MEDIA_ROOT, *(p for p in container))
+        file_path = os.path.join(
-        file_path = os.path.normpath(os.path.join(dir_path, file_name))
+            settings.MEDIA_ROOT,
-        # even if we apply slugify to the file name, add more hardening
+            *(p for p in container)
-        # to avoid any path transversal risk
+        )
-        if not file_path.startswith(str(settings.MEDIA_ROOT)):
+        Path(file_path).mkdir(parents=True, exist_ok=True)
-            return HttpResponseBadRequest()
+        with open(os.path.join(file_path, file_name), 'wb+') as f:
-
-        Path(dir_path).mkdir(parents=True, exist_ok=True)
-        with open(file_path, "wb+") as f:
             for chunk in file_obj.chunks():
                 f.write(chunk)
 
-            return JsonResponse(
+            return JsonResponse({
-                {
+                'message': 'Image uploaded successfully',
-                    "message": "Image uploaded successfully",
+                'location': posixpath.join(
-                    "location": posixpath.join(
+                    settings.MEDIA_URL,
-                        settings.MEDIA_URL, *(p for p in container), file_name
+                    *(p for p in container),
-                    ),
+                    file_name
-                }
+                )
-            )
+            })

ram/roster/migrations/0010_alter_rollingstock_notes.py

@@ -1,7 +1,6 @@
 # Generated by Django 4.1 on 2022-08-23 15:54
 
-# ckeditor removal
+import ckeditor_uploader.fields
-# import ckeditor_uploader.fields
 from django.db import migrations
 
 
@@ -12,9 +11,9 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        # migrations.AlterField(
+        migrations.AlterField(
-        #     model_name="rollingstock",
+            model_name="rollingstock",
-        #     name="notes",
+            name="notes",
-        #     field=ckeditor_uploader.fields.RichTextUploadingField(blank=True),
+            field=ckeditor_uploader.fields.RichTextUploadingField(blank=True),
-        # ),
+        ),
     ]

ram/roster/migrations/0012_rollingstockjournal.py

@@ -1,7 +1,6 @@
 # Generated by Django 4.1 on 2022-08-27 12:43
 
-# ckeditor removal
+import ckeditor_uploader.fields
-# import ckeditor_uploader.fields
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -26,8 +25,7 @@ class Migration(migrations.Migration):
                     ),
                 ),
                 ("date", models.DateField()),
-                # ("log", ckeditor_uploader.fields.RichTextUploadingField()),
+                ("log", ckeditor_uploader.fields.RichTextUploadingField()),
-                ("log", models.TextField()),
                 ("private", models.BooleanField(default=False)),
                 ("creation_time", models.DateTimeField(auto_now_add=True)),
                 ("updated_time", models.DateTimeField(auto_now=True)),