fix #648: unable to unlink

django-cms · Sep 20, 2023 · 9fe48f3 · 9fe48f3
1 parent eb1e8c8
commit 9fe48f3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/djangocms_text_ckeditor/cms_plugins.py b/djangocms_text_ckeditor/cms_plugins.py
@@ -417,13 +417,13 @@ def _get_text_plugin_from_request(self, request, data):
             raise PermissionDenied
 
         form = ActionTokenValidationForm(data)
-
         if form.is_valid():
             session_key = request.session.session_key
             text_plugin_id = form.get_id_from_token(session_key)
 
             if text_plugin_id:
                 return self._get_plugin_or_404(text_plugin_id)
+
         message = gettext("Unable to process your request. Invalid token.")
         raise ValidationError(message=force_str(message))
 
@@ -436,10 +436,9 @@ def render_plugin(self, request):
             return HttpResponseBadRequest(error.message)
 
         form = RenderPluginForm(request.GET, text_plugin=text_plugin)
-
         if not form.is_valid():
-            message = gettext("Unable to process your request.")
-            return HttpResponseBadRequest(message)
+            # plugin not found, inform CKEDITOR.plugins.insertPlugin to remove it
+            return HttpResponse(status=204)
 
         plugin_class = text_plugin.get_plugin_class_instance()
         # The following is needed for permission checking

diff --git a/djangocms_text_ckeditor/static/djangocms_text_ckeditor/ckeditor_plugins/cmsplugins/plugin.js b/djangocms_text_ckeditor/static/djangocms_text_ckeditor/ckeditor_plugins/cmsplugins/plugin.js
@@ -383,10 +383,14 @@
                     token: settings.action_token,
                     plugin: data.plugin_id
                 }
-            }).done(function (res) {
-				CMS.CKEditor.editors[editor.id].changed = true;
-				CMS.CKEditor.editors[editor.id].child_changed = true;
-                editor.insertHtml(res, 'unfiltered_html');
+            }).done(function (res, textStatus, jqXHR) {
+                CMS.CKEditor.editors[editor.id].changed = true;
+                CMS.CKEditor.editors[editor.id].child_changed = true;
+                if (jqXHR.status === 200) {
+                    editor.insertHtml(res, 'unfiltered_html');
+                } else if (jqXHR.status === 204) {
+                    editor.insertHtml(editor.getSelectedHtml().$.textContent);
+                }
                 editor.fire('updateSnapshot');
             });
         },