Skip to content
Permalink
Browse files

Merge conflict for file upload token

  • Loading branch information
carlosbpf committed Dec 10, 2019
2 parents db2ba0d + c6ede51 commit 25467f911ea9ef6cabff4c650d3570024cfd9964
Showing with 1 addition and 1 deletion.
  1. +1 −1 view/src/main/resources/static/js/lib/newckeditorplugins/config.js
@@ -4,7 +4,7 @@ CKEDITOR.editorConfig = function( config ) {

config.extraPlugins = 'justify,colorbutton,uploadimage,copyformatting,font,indentblock';
config.uploadUrl = '/image/uploadCkEditor';
config.filebrowserImageUploadUrl = '/image/uploadCkEditor?' + _csrf.parameterName + '=' + _csrf.token ;
config.filebrowserImageUploadUrl = '/image/uploadCkEditor?' + window._csrf.parameterName + "=" +window._csrf.token ;
config.toolbar = 'custom';
config.toolbar_custom = [
{ name: 'clipboard', groups: [ 'clipboard', 'undo' ], items: [ 'Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo' ,'-','CopyFormatting'] },

0 comments on commit 25467f9

Please sign in to comment.
You can’t perform that action at this time.