From 735ca6320b7e1b78532a95496994807f7a94aec9 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Thu, 3 Apr 2014 11:24:58 +0200 Subject: [PATCH] rebase plugin over django-cms-text-ckeditor --- cms_ajax_text_plugin/__init__.py | 2 +- cms_ajax_text_plugin/cms_plugins.py | 4 +--- setup.py | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cms_ajax_text_plugin/__init__.py b/cms_ajax_text_plugin/__init__.py index 64477cf..3b3dacb 100644 --- a/cms_ajax_text_plugin/__init__.py +++ b/cms_ajax_text_plugin/__init__.py @@ -1 +1 @@ -__version__ = '1.2' +__version__ = '2.0' diff --git a/cms_ajax_text_plugin/cms_plugins.py b/cms_ajax_text_plugin/cms_plugins.py index 9cd5f8a..57144a3 100644 --- a/cms_ajax_text_plugin/cms_plugins.py +++ b/cms_ajax_text_plugin/cms_plugins.py @@ -1,13 +1,12 @@ from django.utils.translation import ugettext_lazy as _ from django.template import loader -from cmsplugin_text_wrapper.cms_plugins import TextPlugin +from djangocms_text_ckeditor.cms_plugins import TextPlugin from cms.plugin_pool import plugin_pool class AjaxTextPlugin(TextPlugin): name = _(u'Text (asynchronous loading)') ajax_render_template = 'cms_ajax_text_plugin/plugin.html' - text_enabled = True def get_ajax_body(self, instance, context): t = loader.get_template(self.ajax_render_template) @@ -17,7 +16,6 @@ class AjaxTextPlugin(TextPlugin): request = context.get('request') if 'updatecache' in request.GET: instance.args = '?updatecache' - context['object'] = instance edit_mode = request and 'edit' in request.GET is_ajax = request and request.is_ajax() if edit_mode or is_ajax: diff --git a/setup.py b/setup.py index 7adc027..2fc7e2a 100755 --- a/setup.py +++ b/setup.py @@ -114,6 +114,7 @@ setup(name="django-cms-ajax-text-plugin", ], install_requires=[ 'django-cms<3', + 'djangocms-text-ckeditor', ], cmdclass={'build': build, 'install_lib': install_lib, 'compile_translations': compile_translations,