OO-3986: Put flag in main html if edu-sharing is enabled

src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java

@@ -115,6 +115,7 @@ import org.olat.course.assessment.ui.mode.AssessmentModeGuardController;
 import org.olat.course.assessment.ui.mode.ChooseAssessmentModeEvent;
 import org.olat.gui.control.UserToolsMenuController;
 import org.olat.home.HomeSite;
+import org.olat.modules.edusharing.EdusharingModule;
 import org.olat.user.UserManager;
 import org.olat.user.propertyhandlers.UserPropertyHandler;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -199,6 +200,8 @@ public class BaseFullWebappController extends BasicController implements DTabs,
 	private UserManager userManager;
 	@Autowired
 	private AnalyticsModule analyticsModule;
+	@Autowired
+	private EdusharingModule edusharingModule;
 	
 	public BaseFullWebappController(UserRequest ureq, BaseFullWebappControllerParts baseFullWebappControllerParts) {
 		// only-use-in-super-call, since we define our own
@@ -377,6 +380,11 @@ public class BaseFullWebappController extends BasicController implements DTabs,
 			}
 		}
 		
+		// Enable edu-sharing html snippet replacement
+		if (edusharingModule.isEnabled()) {
+			mainVc.contextPut("edusharingEnabled", Boolean.TRUE);
+		}
+		
 		// content panel
 		contentPanel = new Panel("olatContentPanel");
 		mainVc.put("olatContentPanel", contentPanel);
@@ -1054,6 +1062,7 @@ public class BaseFullWebappController extends BasicController implements DTabs,
 		}
 	}
 
+	@Override
 	public void removeDTab(UserRequest ureq, DTab delt) {
 		// remove from tab list and mapper table
 		synchronized (dtabs) {//o_clusterOK dtabs are per user session only - user session is always in the same vm

src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html

@@ -40,6 +40,10 @@ o_info.i18n_noresponse = "$r.escapeDoubleQuotes($r.translate("server.no.response
 o_info.i18n_topnav_more = "$r.escapeDoubleQuotes($r.translate("header.topnav.more"))";
 o_info.oo_noresponse_title = "$r.escapeJavaScript($r.translateWithPackage("org.olat.login","timeout.title"))";
 o_info.oo_noresponse = "$r.escapeJavaScript($r.translateWithPackage("org.olat.login","timeout.message"))";
+## edu-sharing
+#if($edusharingEnabled)
+o_info.edusharing_enabled = true;
+#end
 ## Initialize zindex manager
 o_info.zseed = 0;
 #if($enforceTopFrame)

src/main/java/org/olat/modules/edusharing/EdusharingDispatcher.java

@@ -108,11 +108,7 @@ public class EdusharingDispatcher implements Dispatcher {
 
 		try {
 			String command = getCommand(request);
-			if ("enabled".equals(command)) {
-				// If module is not enabled, an error is triggered above
-				response.setStatus(HttpServletResponse.SC_OK);
-				response.setContentType("text/plain");
-			} else if (METADATA_PATH.equals(command)) {
+			if (METADATA_PATH.equals(command)) {
 				buildMetadata(ureq, response);
 			} else if (ureq.getUserSession().isAuthenticated()) {
 				switch (command) {

src/main/webapp/static/js/functions.js

@@ -2096,20 +2096,11 @@ var BDebugger = {
 var OOEdusharing = {
 		
 	start: function() {
-		var url = o_info.uriprefix.replace("auth", "edusharing") + "enabled";
-		jQuery.ajax({
-			type: "GET",
-			url: url,
-			dataType : 'text',
-			success : function(){
-				OOEdusharing.render();
-				jQuery(document).on("oo.dom.replacement.after", OOEdusharing.render);
-				OOEdusharing.enableMetadataToggler();
-			},
-			error : function(XMLHttpRequest, textStatus, errorThrown) {
-				// Unbind. Not needed as long this method is only triggered on document ready.
-			}
-		})
+		if (o_info.edusharing_enabled) {
+			OOEdusharing.render();
+			jQuery(document).on("oo.dom.replacement.after", OOEdusharing.render);
+			OOEdusharing.enableMetadataToggler();
+		}
 	},
 		
 	replaceWithSpinner: function(node, width, height) {