mirror of
https://github.com/daniviga/django-ram.git
synced 2025-08-04 13:17:50 +02:00
Replace ckeditor with tinymce (#30)
* Replace ckeditor with tinymce due to deprecation * Remove any ckeditor dependency from old migrations Disable alters, replace create with plain models.TextField * Reformat files * Add more hardening in image_upload
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
# Generated by Django 4.1 on 2022-08-23 15:54
|
||||
|
||||
import ckeditor_uploader.fields
|
||||
# ckeditor removal
|
||||
# import ckeditor_uploader.fields
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
@@ -11,9 +12,9 @@ class Migration(migrations.Migration):
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="rollingstock",
|
||||
name="notes",
|
||||
field=ckeditor_uploader.fields.RichTextUploadingField(blank=True),
|
||||
),
|
||||
# migrations.AlterField(
|
||||
# model_name="rollingstock",
|
||||
# name="notes",
|
||||
# field=ckeditor_uploader.fields.RichTextUploadingField(blank=True),
|
||||
# ),
|
||||
]
|
||||
|
@@ -1,6 +1,7 @@
|
||||
# Generated by Django 4.1 on 2022-08-27 12:43
|
||||
|
||||
import ckeditor_uploader.fields
|
||||
# ckeditor removal
|
||||
# import ckeditor_uploader.fields
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
@@ -25,7 +26,8 @@ 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)),
|
||||
|
@@ -0,0 +1,24 @@
|
||||
# Generated by Django 5.0.2 on 2024-02-17 12:19
|
||||
|
||||
import tinymce.models
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("roster", "0021_alter_rollingstockdocument_file_and_more"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="rollingstock",
|
||||
name="notes",
|
||||
field=tinymce.models.HTMLField(blank=True),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name="rollingstockjournal",
|
||||
name="log",
|
||||
field=tinymce.models.HTMLField(),
|
||||
),
|
||||
]
|
@@ -7,7 +7,7 @@ from django.urls import reverse
|
||||
from django.conf import settings
|
||||
from django.dispatch import receiver
|
||||
|
||||
from ckeditor_uploader.fields import RichTextUploadingField
|
||||
from tinymce import models as tinymce
|
||||
|
||||
from ram.models import Document, Image, PropertyInstance
|
||||
from ram.utils import DeduplicatedStorage
|
||||
@@ -85,7 +85,7 @@ class RollingStock(models.Model):
|
||||
era = models.CharField(max_length=32, blank=True)
|
||||
production_year = models.SmallIntegerField(null=True, blank=True)
|
||||
purchase_date = models.DateField(null=True, blank=True)
|
||||
notes = RichTextUploadingField(blank=True)
|
||||
notes = tinymce.HTMLField(blank=True)
|
||||
tags = models.ManyToManyField(
|
||||
Tag, related_name="rolling_stock", blank=True
|
||||
)
|
||||
@@ -175,7 +175,7 @@ class RollingStockJournal(models.Model):
|
||||
blank=False,
|
||||
)
|
||||
date = models.DateField()
|
||||
log = RichTextUploadingField()
|
||||
log = tinymce.HTMLField()
|
||||
private = models.BooleanField(default=False)
|
||||
creation_time = models.DateTimeField(auto_now_add=True)
|
||||
updated_time = models.DateTimeField(auto_now=True)
|
||||
|
Reference in New Issue
Block a user