rc/aircox
13
1
Fork 1
Code Issues 15 Pull Requests Projects Releases Wiki Activity

Compare commits

base: rc:607468c052ce8fc6a1ff05763a33cb8e3f94c13c
Branches Tags
rc:develop-1.0
rc:master
..
compare: rc:53512d9dcf5ba05169ccd7c0a03dac1ab2f769c6
Branches Tags
rc:develop-1.0
rc:master

No commits in common. "607468c052ce8fc6a1ff05763a33cb8e3f94c13c" and "53512d9dcf5ba05169ccd7c0a03dac1ab2f769c6" have entirely different histories.
607468c052 ... 53512d9dcf

3 changed files with 21 additions and 4 deletions
Show Stats Expand all files Collapse all files

7
aircox/migrations/0001_initial.py
View File

@ -1,5 +1,6 @@
# Generated by Django 3.0.6 on 2020-05-26 12:57 # Generated by Django 3.0.6 on 2020-05-26 12:57
import ckeditor.fields
from django.conf import settings from django.conf import settings
from django.db import migrations, models from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
@ -122,7 +123,7 @@ class Migration(migrations.Migration):
), ),
( (
"content", "content",
models.TextField(blank=True, null=True, verbose_name="content"), ckeditor.fields.RichTextField(blank=True, null=True, verbose_name="content"),
), ),
("pub_date", models.DateTimeField(blank=True, null=True)), ("pub_date", models.DateTimeField(blank=True, null=True)),
( (
@ -332,7 +333,7 @@ class Migration(migrations.Migration):
"active", "active",
models.BooleanField( models.BooleanField(
default=True, default=True,
help_text="if not chemodels.onger active", help_text="if not checked this program is no longer active",
verbose_name="active", verbose_name="active",
), ),
), ),
@ -555,7 +556,7 @@ class Migration(migrations.Migration):
), ),
( (
"content", "content",
models.TextField(blank=True, null=True, verbose_name="content"), ckeditor.fields.RichTextField(blank=True, null=True, verbose_name="content"),
), ),
( (
"view", "view",

11
aircox/migrations/0004_auto_20200921_2356.py
View File

@ -1,5 +1,6 @@
# Generated by Django 3.1.1 on 2020-09-21 23:56 # Generated by Django 3.1.1 on 2020-09-21 23:56
import ckeditor_uploader.fields
from django.db import migrations, models from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
@ -29,6 +30,11 @@ class Migration(migrations.Migration):
model_name="sound", model_name="sound",
name="embed", name="embed",
), ),
migrations.AlterField(
model_name="page",
name="content",
field=ckeditor_uploader.fields.RichTextUploadingField(blank=True, null=True, verbose_name="content"),
),
migrations.AlterField( migrations.AlterField(
model_name="sound", model_name="sound",
name="program", name="program",
@ -41,4 +47,9 @@ class Migration(migrations.Migration):
), ),
preserve_default=False, preserve_default=False,
), ),
migrations.AlterField(
model_name="staticpage",
name="content",
field=ckeditor_uploader.fields.RichTextUploadingField(blank=True, null=True, verbose_name="content"),
),
] ]

7
aircox/models/page.py
View File

@ -1,6 +1,7 @@
import re import re
import bleach import bleach
from ckeditor_uploader.fields import RichTextUploadingField
from django.db import models from django.db import models
from django.urls import reverse from django.urls import reverse
from django.utils import timezone as tz from django.utils import timezone as tz
@ -99,7 +100,11 @@ class BasePage(Renderable, models.Model):
null=True, null=True,
blank=True, blank=True,
) )
content = models.TextField(_("content"), blank=True, null=True) content = RichTextUploadingField(
_("content"),
blank=True,
null=True,
)
objects = BasePageQuerySet.as_manager() objects = BasePageQuerySet.as_manager()