Skip to content

Commit 162d2b2

Browse files
SilverYoChaNicolasEYSSERIC
authored andcommitted
Feature #9331: adding the drag & drop of images on WYSIWYG Editor
1 parent 73695d3 commit 162d2b2

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

gallery/gallery-library/src/main/java/org/silverpeas/components/gallery/process/media/GalleryDeleteMediaDataProcess.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,9 @@ private void removeXMLContentOfMedia(final String mediaId,
103103

104104
final RecordSet set = pubTemplate.getRecordSet();
105105
final DataRecord data = set.getRecord(mediaId);
106-
set.delete(data.getId());
106+
if (data != null) {
107+
set.delete(data.getId());
108+
}
107109
}
108110
} catch (final PublicationTemplateException | FormException e) {
109111
throw new GalleryRuntimeException(e);

infoLetter/infoLetter-war/src/main/webapp/wysiwyg/jsp/ckeditor/infoLetterConfig.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ CKEDITOR.editorConfig = function( config )
1414
config.filebrowserImageBrowseUrl = config.baseHref+'uploadFile.jsp';
1515
config.filebrowserFlashBrowseUrl = config.baseHref+'uploadFile.jsp';
1616
config.filebrowserBrowseUrl = config.baseHref+'uploadFile.jsp';
17+
config.imageUploadUrl = 'activated';
1718
config.extraPlugins = 'userzoom,identitycard,allmedias,autolink,video,html5audio,imageresizerowandcolumn,variables,listblock,floatpanel,richcombo,mediaofcontribution,imagebank,filebank';
1819
config.allowedContent = true;
1920
config.toolbarCanCollapse = true;

0 commit comments

Comments
 (0)