Scrap CKEditor from requirements and old migrations

code4romania · Jul 23, 2024 · 4c15539 · 4c15539
1 parent 6911298
commit 4c15539
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 28 deletions.
diff --git a/backend/civil_society_vote/settings.py b/backend/civil_society_vote/settings.py
@@ -31,7 +31,7 @@
 BASE_DIR = os.path.abspath(os.path.join(root, "backend"))
 
 
-SILENCED_SYSTEM_CHECKS = ["ckeditor.W001"]
+SILENCED_SYSTEM_CHECKS = []
 
 
 env = environ.Env(
@@ -180,8 +180,6 @@
     "rangefilter",
     "impersonate",
     "guardian",
-    "ckeditor",
-    "ckeditor_uploader",
     "tinymce",
 ]
 
@@ -514,11 +512,6 @@ def show_toolbar(request):
 )
 AVATAR_DEFAULT_URL = "/images/photo-placeholder.gif"
 
-CKEDITOR_BASEPATH = f"{STATIC_URL}ckeditor/ckeditor/"
-CKEDITOR_CONFIGS = {
-    "default": {"toolbar": "full", "height": 600, "width": 950},
-}
-CKEDITOR_UPLOAD_PATH = "uploads/"
 
 # Django logging
 LOGGING = {

diff --git a/backend/civil_society_vote/urls.py b/backend/civil_society_vote/urls.py
@@ -43,7 +43,6 @@
     ),
     path("admin/", admin.site.urls),
     path("impersonate/", include("impersonate.urls")),
-    # path("ckeditor/", include("ckeditor_uploader.urls")),
     path("tinymce/", include("tinymce.urls")),
     path(
         _("accounts/error/registration-closed/"),

diff --git a/backend/hub/migrations/0013_emailtemplate.py b/backend/hub/migrations/0013_emailtemplate.py
@@ -1,6 +1,6 @@
 # Generated by Django 2.2.16 on 2020-10-02 08:15
 
-import ckeditor.fields
+import tinymce.models
 import django.utils.timezone
 import model_utils.fields
 from django.db import migrations, models
@@ -43,7 +43,7 @@ class Migration(migrations.Migration):
                     ),
                 ),
                 ("text_content", models.TextField(verbose_name="Text content")),
-                ("html_content", ckeditor.fields.RichTextField(verbose_name="HTML content", blank=True)),
+                ("html_content", tinymce.models.HTMLField(verbose_name="HTML content", blank=True)),
             ],
             options={
                 "verbose_name": "Email template",

diff --git a/backend/hub/migrations/0037_blogpost.py b/backend/hub/migrations/0037_blogpost.py
@@ -1,6 +1,6 @@
 # Generated by Django 2.2.19 on 2021-03-17 09:11
 
-import ckeditor_uploader.fields
+import tinymce.models
 import django.utils.timezone
 import model_utils.fields
 from django.db import migrations, models
@@ -33,7 +33,7 @@ class Migration(migrations.Migration):
                 ("slug", models.SlugField(unique=True)),
                 ("author", models.CharField(max_length=100, verbose_name="Author")),
                 ("content_preview", models.TextField(verbose_name="Content preview")),
-                ("content", ckeditor_uploader.fields.RichTextUploadingField(verbose_name="Content")),
+                ("content", tinymce.models.HTMLField(verbose_name="Content")),
                 ("is_visible", models.BooleanField(default=False, verbose_name="Is visible?")),
                 ("published_date", models.DateField(blank=True, null=True, verbose_name="Date published")),
             ],

diff --git a/backend/requirements-dev.txt b/backend/requirements-dev.txt
@@ -66,12 +66,10 @@ django==4.2.14
     #   django-admin-autocomplete-filter
     #   django-allauth
     #   django-appconf
-    #   django-ckeditor
     #   django-crispy-forms
     #   django-debug-toolbar
     #   django-extensions
     #   django-guardian
-    #   django-js-asset
     #   django-model-utils
     #   django-picklefield
     #   django-q2
@@ -91,8 +89,6 @@ django-appconf==1.0.6
     #   django-avatar
 django-avatar==8.0.0
     # via -r requirements.txt
-django-ckeditor==6.7.1
-    # via -r requirements.txt
 django-crispy-forms==2.2
     # via -r requirements.txt
 django-debug-toolbar==4.4.6
@@ -107,10 +103,6 @@ django-guardian==2.4.0
     # via -r requirements.txt
 django-impersonate==1.9.4
     # via -r requirements.txt
-django-js-asset==2.2.0
-    # via
-    #   -r requirements.txt
-    #   django-ckeditor
 django-model-utils==4.5.1
     # via -r requirements.txt
 django-picklefield==3.2

diff --git a/backend/requirements.in b/backend/requirements.in
@@ -21,7 +21,6 @@ django-admin-rangefilter~=0.13.0
 django-model-utils~=4.5.1
 django-impersonate~=1.9.2
 django-guardian~=2.4.0
-django-ckeditor~=6.7.1  # TODO: scrap this because CKEditor changed the license
 django-tinymce~=4.1.0
 
 # file handling

diff --git a/backend/requirements.txt b/backend/requirements.txt
@@ -39,10 +39,8 @@ django==4.2.14
     #   django-admin-autocomplete-filter
     #   django-allauth
     #   django-appconf
-    #   django-ckeditor
     #   django-crispy-forms
     #   django-guardian
-    #   django-js-asset
     #   django-model-utils
     #   django-picklefield
     #   django-q2
@@ -61,8 +59,6 @@ django-appconf==1.0.6
     # via django-avatar
 django-avatar==8.0.0
     # via -r requirements.in
-django-ckeditor==6.7.1
-    # via -r requirements.in
 django-crispy-forms==2.2
     # via -r requirements.in
 django-environ==0.11.2
@@ -73,8 +69,6 @@ django-guardian==2.4.0
     # via -r requirements.in
 django-impersonate==1.9.4
     # via -r requirements.in
-django-js-asset==2.2.0
-    # via django-ckeditor
 django-model-utils==4.5.1
     # via -r requirements.in
 django-picklefield==3.2