use correct cms_path

django-cms · Jan 2, 2017 · e2f423c · e2f423c
1 parent 8be5c4e
commit e2f423c
Show file tree

Hide file tree

Showing 2 changed files with 1,183 additions and 2 deletions.
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
@@ -277,7 +277,7 @@
             $(dialog.parts.title.$).text(this.options.lang.edit);
 
             var textPluginUrl = window.location.href;
-            var path = encodeURIComponent(window.location.pathname);
+            var path = encodeURIComponent(window.parent.location.pathname + window.parent.location.search);
             var childPluginUrl = textPluginUrl.replace(
                 /(add-plugin|edit-plugin).*$/,
                 'edit-plugin/' + id + '/?_popup=1&no_preview&cms_history=0&cms_path=' + path
@@ -311,7 +311,7 @@
                 plugin_type: item.attr('rel'),
                 plugin_parent: this.options.plugin_id,
                 plugin_language: this.options.plugin_language,
-                cms_path: window.location.pathname,
+                cms_path: window.parent.location.pathname,
                 cms_history: 0
             };