From 68d4342df403eeb23509bca4d2eef4d0d8e1d574 Mon Sep 17 00:00:00 2001 From: Mark Stahler Date: Wed, 18 Jan 2012 08:33:13 -0500 Subject: [PATCH] removed urls.py which is not required if django-tinymce is installed properly. fixed new bug relating to codemirror introduced by tinymce --- dbtemplates/admin.py | 2 -- dbtemplates/urls.py | 4 ---- 2 files changed, 6 deletions(-) delete mode 100644 dbtemplates/urls.py diff --git a/dbtemplates/admin.py b/dbtemplates/admin.py index 3f966fc..7e4dae8 100644 --- a/dbtemplates/admin.py +++ b/dbtemplates/admin.py @@ -67,8 +67,6 @@ if settings.DBTEMPLATES_USE_CODEMIRROR and settings.DBTEMPLATES_USE_TINYMCE: if settings.DBTEMPLATES_USE_TINYMCE: from tinymce.widgets import AdminTinyMCE TemplateContentTextArea = AdminTinyMCE -else: - TemplateContentTextArea = forms.Textarea class TemplateAdminForm(forms.ModelForm): diff --git a/dbtemplates/urls.py b/dbtemplates/urls.py deleted file mode 100644 index 62d9494..0000000 --- a/dbtemplates/urls.py +++ /dev/null @@ -1,4 +0,0 @@ -from django.conf.urls.defaults import * - -if 'tinymce' in settings.INSTALLED_APPS: - urlpatterns += patterns('', url(r'^tinymce/', include('tinymce.urls')))