From 8795dc9922aec7c46591d52fdc7d1c7da677725e Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Thu, 1 Jun 2017 13:11:09 +0000
Subject: [PATCH] SSDM-4718: configure for openbis/file-service

SVN: 38243
---
 .../1/as/webapps/eln-lims/html/js/util/FormUtil.js         | 5 ++++-
 .../1/as/webapps/eln-lims/html/lib/ckeditor/js/config.js   | 7 +++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
index 456772ea127..be8b90e33df 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
@@ -772,7 +772,10 @@ var FormUtil = new function() {
 	// Rich Text Editor Support - (CKEditor)
 	//
 	CKEDITOR.on( 'instanceReady', function( ev ) {
-	    ev.editor.dataProcessor.writer.selfClosingEnd = ' />';
+		var sessionToken = mainController.serverFacade.getSession();
+		ev.editor.config.filebrowserUploadUrl = '/openbis/file-service/eln-lims?sessionID=' + sessionToken;
+		ev.editor.config.uploadUrl = '/openbis/file-service/eln-lims?sessionID=' + sessionToken;
+		ev.editor.dataProcessor.writer.selfClosingEnd = ' />';
 	});
 	
 	this.activateRichTextProperties = function($component, componentOnChange, propertyType) {
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/ckeditor/js/config.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/ckeditor/js/config.js
index 495ea421641..ca8fd3d4018 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/ckeditor/js/config.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/ckeditor/js/config.js
@@ -10,9 +10,7 @@ CKEDITOR.editorConfig = function( config ) {
 	config.specialChars = config.specialChars.concat( ['&alpha;', '&beta;', '&gamma;', '&delta;', 
 	                                                    '&epsilon;', '&zeta;', '&eta;', '&theta;', '&kappa;', '&lambda;', '&mu;', '&xi;', '&pi;', '&rho;', '&sigma;', 
 	                                                    '&upsilon;', '&phi;', '&psi;', '&omega;', '&Delta;', '&Sigma;', '&Phi;', '&Omega;'] );
-	config.extraPlugins='confighelper';
-//	config.extraPlugins='uploadimage,confighelper';
-//	config.uploadUrl = '/uploader/upload.php';
+	config.extraPlugins = 'uploadimage,confighelper';
 	config.stylesSet = false;
 	config.toolbarGroups = [
 	    					{ name: 'document', groups: [ 'mode', 'document', 'doctools' ] },
@@ -31,5 +29,6 @@ CKEDITOR.editorConfig = function( config ) {
 	    					{ name: 'others', groups: [ 'others' ] },
 	    					{ name: 'about', groups: [ 'about' ] }
 	    				];
-	config.removeButtons = 'Save,NewPage,Templates,About,Image,Flash,Smiley,Iframe,Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField,Styles,Source';
+	config.removeButtons = 'Save,NewPage,Templates,About,Flash,Smiley,Iframe,Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField,Styles,Source';
+	
 };
\ No newline at end of file
-- 
GitLab