Merge OpenOLAT 10 to OpenOLAT default branch with ac935d92fe1dd673022a0e210ad47a952dcc2db1

src/main/java/org/olat/admin/user/tools/ui/UserToolsAdminController.java

@@ -76,21 +76,17 @@ public class UserToolsAdminController extends FormBasicController {
 
 		availableEl = uifactory.addCheckboxesVertical("available.tools", "available.tools", formLayout, toolKeys, toolValues, 1);
 		availableEl.addActionListener(FormEvent.ONCHANGE);
-		
-		if(userToolsModule.isUserToolsDisabled()) {
-			availableEl.setEnabled(false);
+
+		Set<String> availableTools = userToolsModule.getAvailableUserToolSet();
+		if(availableTools.isEmpty()) {
+			for(String toolKey:toolKeys) {
+				availableEl.select(toolKey, true);
+			}
 		} else {
-			Set<String> tools = userToolsModule.getAvailableUserToolSet();
-			if(tools.isEmpty()) {
-				for(String toolKey:toolKeys) {
+			for(String toolKey:toolKeys) {
+				if(availableTools.contains(toolKey)) {
 					availableEl.select(toolKey, true);
 				}
-			} else {
-				for(String toolKey:toolKeys) {
-					if(tools.contains(toolKey)) {
-						availableEl.select(toolKey, true);
-					}
-				}
 			}
 		}
 
@@ -109,7 +105,6 @@ public class UserToolsAdminController extends FormBasicController {
 				}
 			}
 		}
-		
 	}
 	
 	@Override
@@ -122,6 +117,11 @@ public class UserToolsAdminController extends FormBasicController {
 		if(availableEl == source) {
 			//update defaultSet;
 			doPersist();
+			if(availableEl.isAtLeastSelected(1)) {
+				presetEl.setEnabled(true);
+			} else {
+				presetEl.setEnabled(false);
+			}
 		} else if(presetEl == source) {
 			doPersist();
 		}

src/main/java/org/olat/ims/qti/process/FilePersister.java

@@ -149,22 +149,15 @@ public class FilePersister implements Persister {
 		Object o = null;
 		InputStream is = null;
 		try {
-			long start = -1;
-			boolean debugOn = log.isDebug();
-			if (debugOn) {
-				start = System.currentTimeMillis();
+			File fSerialFile = new File(fSerialDir, QTI_FILE);
+			if(fSerialDir.exists()) {
+				is = new FileInputStream(fSerialFile);
+				BufferedInputStream bis = new BufferedInputStream(is, 262144);
+				ObjectInputStream oistream = new DecompressibleInputStream(bis);
+				o = oistream.readObject();
+				oistream.close();
+				is.close();
 			}
-			is = new FileInputStream(new File(fSerialDir, QTI_FILE));
-			BufferedInputStream bis = new BufferedInputStream(is, 262144);
-			ObjectInputStream oistream = new DecompressibleInputStream(bis);
-			o = oistream.readObject();
-			oistream.close();
-			is.close();
-			if (debugOn) {
-				long stop = System.currentTimeMillis();
-				log.debug("time in ms to load ims qti ser file:"+(stop-start));
-			}
-
 		} catch (Exception e) {
 			log.error("", e);
 			try {

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

@@ -909,9 +909,13 @@ jQuery().ready(OPOL.adjustHeight);
 
 
 function o_scrollToElement(elem) {
-	jQuery('html, body').animate({
-		scrollTop: jQuery(elem).offset().top
-	}, 333);
+	try {
+		jQuery('html, body').animate({
+			scrollTop : jQuery(elem).offset().top
+		}, 333);
+	} catch (e) {
+		//console.log(e);
+	}
 }
 
 function o_popover(id, contentId, loc) {
@@ -1188,12 +1192,11 @@ function showInfoBox(title, content){
     };
     // Show info box now
     jQuery('#' + uuid).show().transition({ top: 0 }, 333);
-	o_scrollToElement('#o_top');
-    
     // Visually remove message box immediately when user clicks on it
     jQuery('#' + uuid).click(function(e) {
     	cleanup();
     });
+	o_scrollToElement('#o_top');
 	
     // Help GC, prevent cyclic reference from on-click closure
     title = null;