From 4afc2c212771d9d1daafaa62d84cba466d7d92fc Mon Sep 17 00:00:00 2001
From: Oliver Marks <oly@digitaloctave.com>
Date: Sat, 18 Mar 2017 14:16:47 +0000
Subject: [PATCH] put draceditor fork back in to fix a few bugs

---
 docker-compose.yml       | 2 +-
 mhackspace/blog/admin.py | 5 +++++
 requirements/base.txt    | 3 +--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index d697e90..89018ee 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -31,7 +31,7 @@ services:
     user: django
     depends_on:
       - postgres
-      - redis
+#      - redis
     command: /gunicorn.sh
     env_file: .env
     volumes:
diff --git a/mhackspace/blog/admin.py b/mhackspace/blog/admin.py
index 1e955f7..79ca4e5 100644
--- a/mhackspace/blog/admin.py
+++ b/mhackspace/blog/admin.py
@@ -1,6 +1,8 @@
 from django.contrib import admin
 from django.db import models
 from django.contrib.admin import ModelAdmin
+from draceditor.widgets import AdminDraceditorWidget
+from draceditor.models import DraceditorField
 
 from mhackspace.blog.models import Post, Category
 
@@ -13,6 +15,9 @@ class PostAdmin(ModelAdmin):
     readonly_fields = ('published_date',)
     filter_horizontal = ('categories',)
     prepopulated_fields = {"slug": ("title",)}
+    formfield_overrides = {
+        DraceditorField: {'widget': AdminDraceditorWidget},
+    }
 
 @admin.register(Category)
 class CategoryAdmin(ModelAdmin):
diff --git a/requirements/base.txt b/requirements/base.txt
index 9b4c265..d951db2 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -62,6 +62,5 @@ git+https://github.com/olymk2/scaffold.git
 djangorestframework==3.6.2
 django-filter==1.0.1
 
-# draceditor==1.1.6
-
 git+https://github.com/olymk2/dracos-markdown-editor.git
+# draceditor