diff --git a/config/settings/common.py b/config/settings/common.py index c660fe9..6488eae 100644 --- a/config/settings/common.py +++ b/config/settings/common.py @@ -38,7 +38,7 @@ THIRD_PARTY_APPS = ( 'allauth.socialaccount', # registration 'stdimage', 'rest_framework', - 'markdownx', + 'draceditor', ) # Apps specific for this project go here. diff --git a/config/urls.py b/config/urls.py index 01c0cf5..e242ef0 100644 --- a/config/urls.py +++ b/config/urls.py @@ -33,7 +33,7 @@ urlpatterns = [ url(r'^api/v1/', include(router.urls, namespace='v1')), url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')), - url(r'^markdownx/', include('markdownx.urls')), + url(r'^draceditor/', include('draceditor.urls')), url(r'^blog/$', blog, name='contact'), url(r'^blog/rss/$', BlogFeed()), url(r'^blog/(?P[0-9A-Za-z_\-]+)/$', blog, name='blog-item'), diff --git a/mhackspace/blog/admin.py b/mhackspace/blog/admin.py index cbab459..1e955f7 100644 --- a/mhackspace/blog/admin.py +++ b/mhackspace/blog/admin.py @@ -1,7 +1,6 @@ from django.contrib import admin from django.db import models from django.contrib.admin import ModelAdmin -from markdownx.widgets import AdminMarkdownxWidget from mhackspace.blog.models import Post, Category @@ -14,9 +13,6 @@ class PostAdmin(ModelAdmin): readonly_fields = ('published_date',) filter_horizontal = ('categories',) prepopulated_fields = {"slug": ("title",)} - formfield_overrides = { - models.TextField: {'widget': AdminMarkdownxWidget}, - } @admin.register(Category) class CategoryAdmin(ModelAdmin): diff --git a/mhackspace/blog/models.py b/mhackspace/blog/models.py index b02b2a9..ee2e0fe 100644 --- a/mhackspace/blog/models.py +++ b/mhackspace/blog/models.py @@ -1,6 +1,7 @@ from django.db import models from django.utils import timezone from django.urls import reverse +from draceditor.models import DraceditorField from mhackspace.users.models import User from stdimage.models import StdImageField @@ -34,7 +35,7 @@ class Post(models.Model): "height": 220, "crop": True}}) - description = models.TextField() + description = DraceditorField() published_date = models.DateTimeField(default=timezone.now) updated_date = models.DateTimeField(default=timezone.now) active = models.BooleanField(default=True) diff --git a/requirements/base.txt b/requirements/base.txt index 5d5c461..b61eacc 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -62,4 +62,4 @@ git+https://github.com/olymk2/scaffold.git djangorestframework==3.5.4 django-filter==1.0.1 -django-markdownx +draceditor