diff --git a/adhocracy4/ckeditor/fields.py b/adhocracy4/ckeditor/fields.py deleted file mode 100644 index cdb63c43c..000000000 --- a/adhocracy4/ckeditor/fields.py +++ /dev/null @@ -1,17 +0,0 @@ -from ckeditor.fields import RichTextField -from ckeditor_uploader.fields import RichTextUploadingField - - -# FIXME: remove these fields / file -class RichTextCollapsibleMixin: - pass - - -class RichTextCollapsibleField(RichTextCollapsibleMixin, RichTextField): - pass - - -class RichTextCollapsibleUploadingField( - RichTextCollapsibleMixin, RichTextUploadingField -): - pass diff --git a/adhocracy4/projects/migrations/0001_initial.py b/adhocracy4/projects/migrations/0001_initial.py index c6e8c8011..25b7f0196 100644 --- a/adhocracy4/projects/migrations/0001_initial.py +++ b/adhocracy4/projects/migrations/0001_initial.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals from django.db import migrations, models -import ckeditor_uploader.fields import django.utils.timezone from django.conf import settings import autoslug.fields @@ -62,14 +61,14 @@ class Migration(migrations.Migration): ), ( "information", - ckeditor_uploader.fields.RichTextUploadingField( + models.TextField( help_text="This description should tell participants what the goal of the project is, how the project’s participation will look like. It will be always visible in the „Info“ tab on your project’s page.", verbose_name="Description of your project", ), ), ( "result", - ckeditor_uploader.fields.RichTextUploadingField( + models.TextField( help_text="Here you should explain what the expected outcome of the project will be and how you are planning to use the results. If the project is finished you should add a summary of the results.", blank=True, ), diff --git a/adhocracy4/projects/migrations/0007_add_verbose_names.py b/adhocracy4/projects/migrations/0007_add_verbose_names.py index 71426924e..726905e6c 100644 --- a/adhocracy4/projects/migrations/0007_add_verbose_names.py +++ b/adhocracy4/projects/migrations/0007_add_verbose_names.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals from django.db import migrations, models -import ckeditor_uploader.fields class Migration(migrations.Migration): @@ -15,7 +14,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="project", name="result", - field=ckeditor_uploader.fields.RichTextUploadingField( + field=models.TextField( verbose_name="Results of your project", blank=True, help_text="Here you should explain what the expected outcome of the project will be and how you are planning to use the results. If the project is finished you should add a summary of the results.", diff --git a/adhocracy4/projects/migrations/0009_optional_info.py b/adhocracy4/projects/migrations/0009_optional_info.py index aefaab46b..7505bfc2a 100644 --- a/adhocracy4/projects/migrations/0009_optional_info.py +++ b/adhocracy4/projects/migrations/0009_optional_info.py @@ -2,8 +2,7 @@ # Generated by Django 1.11.4 on 2017-08-14 14:56 from __future__ import unicode_literals -import ckeditor_uploader.fields -from django.db import migrations +from django.db import migrations, models class Migration(migrations.Migration): @@ -16,7 +15,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="project", name="information", - field=ckeditor_uploader.fields.RichTextUploadingField( + field=models.TextField( blank=True, help_text="This description should tell participants what the goal of the project is, how the project’s participation will look like. It will be always visible in the „Info“ tab on your project’s page.", verbose_name="Description of your project", diff --git a/adhocracy4/projects/migrations/0014_collapsible_information_field.py b/adhocracy4/projects/migrations/0014_collapsible_information_field.py index fa973672b..e39be4b9b 100644 --- a/adhocracy4/projects/migrations/0014_collapsible_information_field.py +++ b/adhocracy4/projects/migrations/0014_collapsible_information_field.py @@ -2,8 +2,7 @@ # Generated by Django 1.11.8 on 2018-01-15 15:44 from __future__ import unicode_literals -import adhocracy4.ckeditor.fields -from django.db import migrations +from django.db import migrations, models class Migration(migrations.Migration): @@ -16,7 +15,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="project", name="information", - field=adhocracy4.ckeditor.fields.RichTextCollapsibleUploadingField( + field=models.TextField( blank=True, help_text="This description should tell participants what the goal of the project is, how the project’s participation will look like. It will be always visible in the „Info“ tab on your project’s page.", verbose_name="Description of your project", diff --git a/adhocracy4/projects/migrations/0027_use_collapsiblefield_results.py b/adhocracy4/projects/migrations/0027_use_collapsiblefield_results.py index db3cadbc8..dea403f96 100644 --- a/adhocracy4/projects/migrations/0027_use_collapsiblefield_results.py +++ b/adhocracy4/projects/migrations/0027_use_collapsiblefield_results.py @@ -1,7 +1,6 @@ # Generated by Django 2.2.14 on 2020-09-16 15:34 -import adhocracy4.ckeditor.fields -from django.db import migrations +from django.db import migrations, models class Migration(migrations.Migration): @@ -14,7 +13,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="project", name="result", - field=adhocracy4.ckeditor.fields.RichTextCollapsibleUploadingField( + field=models.TextField( blank=True, help_text="Here you should explain what the expected outcome of the project will be and how you are planning to use the results. If the project is finished you should add a summary of the results.", verbose_name="Results of your project", diff --git a/changelog/_1111.md b/changelog/_1111.md new file mode 100644 index 000000000..d07d9d900 --- /dev/null +++ b/changelog/_1111.md @@ -0,0 +1,3 @@ +### Removed + +- removed the deprecated django-ckeditor fields