Merge OpenOLAT 12.2 to OpenOLAT defualt branch with 97b81331477ce2f98987d676de1ded0b83c9994c

.hgtags

@@ -209,3 +209,4 @@ dc92e2661668e9867d401d8f929c02a6a3f92314 OpenOLAT 12.2.3
 697ae608554412b8bdc73d27519ba47c791516d6 OpenOLAT 12.2.4
 30e784886f4e1aa610acf5f850511adab8e3623e OpenOLAT 12.2.5
 97e8d87f2416ba6dd43d47164100c2b4ec577ab7 OpenOLAT 12.2.6
+4ceae571c62f6e2e2bc5711e7f445836c368bb71 OpenOLAT 12.2.7

src/main/java/org/olat/basesecurity/ui/GroupController.java

@@ -472,7 +472,7 @@ public class GroupController extends BasicController {
 	
 	private void doAddUsers(UserRequest ureq) {
 		removeAsListenerAndDispose(usc);
-		usc = new UserSearchController(ureq, getWindowControl(), true, true, false);			
+		usc = new UserSearchController(ureq, getWindowControl(), true, true, true);			
 		listenTo(usc);
 		
 		Component usersearchview = usc.getInitialComponent();

src/main/java/org/olat/commons/memberlist/ui/MembersAvatarDisplayRunController.java

@@ -237,7 +237,7 @@ public class MembersAvatarDisplayRunController extends FormBasicController {
 		FormLayoutContainer container = FormLayoutContainer.createCustomFormLayout(name, getTranslator(), page);
 		container.contextPut("userPropertyHandlers", userPropertyAvatarHandlers);
 		// add lookup table so the avatar properties can be read out from the member object that contains the full list of attributes
-		Map<String, Integer> handlerLookupMap = new HashMap<String, Integer>();
+		Map<String, Integer> handlerLookupMap = new HashMap<>();
 		for(int i=userPropertyHandlers.size(); i-->0; ) {
 			UserPropertyHandler handler = userPropertyHandlers.get(i);
 			handlerLookupMap.put(handler.getName(), i);
@@ -254,9 +254,16 @@ public class MembersAvatarDisplayRunController extends FormBasicController {
 	}
 	
 	protected List<Member> createMemberLinks(List<Identity> identities, Set<Long> duplicateCatcher, FormLayoutContainer formLayout, boolean withEmail) {
-		List<Member> members = new ArrayList<>();
+		if(duplicateCatcher == null) {
+			duplicateCatcher = new HashSet<>();
+		}
+		
+		List<Member> members = new ArrayList<>(identities.size());
 		for(Identity identity:identities) {
-			if(duplicateCatcher != null && duplicateCatcher.contains(identity.getKey())) continue;
+			if(duplicateCatcher.contains(identity.getKey())) {
+				continue;
+			}
+			duplicateCatcher.add(identity.getKey());
 			
 			Member member = createMember(identity);
 			members.add(member);
@@ -285,10 +292,6 @@ public class MembersAvatarDisplayRunController extends FormBasicController {
 				formLayout.add(chatLink.getComponent().getComponentName(), chatLink);
 				member.setChatLink(chatLink);
 			}
-			
-			if(duplicateCatcher != null) {
-				duplicateCatcher.add(identity.getKey());
-			}
 		}
 		
 		if(chatEnabled && editable) {

src/main/java/org/olat/course/run/CourseRuntimeController.java

@@ -576,7 +576,7 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
 			if(courseAuthorRight) {
 				catalogLink = LinkFactory.createToolLink("access.cmd", translate("command.catalog"), this, "o_icon_catalog");
 				catalogLink.setElementCssClass("o_sel_course_catalog");
-				catalogLink.setVisible(repositoryModule.isCatalogEnabled() && !uce.isCourseReadOnly());
+				catalogLink.setVisible(repositoryModule.isCatalogEnabled());
 				settings.addComponent(catalogLink);
 				
 				settings.addComponent(new Spacer(""));

src/main/java/org/olat/ims/qti21/pool/QTI21ExportProcessor.java

@@ -223,7 +223,7 @@ public class QTI21ExportProcessor {
 				for(ItemMaterial material:materials.getMaterials()) {
 					String exportPath = material.getExportUri();
 					File originalFile = material.getFile();
-					File exportFile = new File(container, exportPath);
+					File exportFile = new File(containerDir, exportPath);
 					if(!exportFile.getParentFile().exists()) {
 						exportFile.getParentFile().mkdirs();
 					}

src/main/java/org/olat/ims/qti21/ui/statistics/QTI21PrintController.java

@@ -31,10 +31,11 @@ import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.Event;
 import org.olat.core.gui.control.WindowControl;
 import org.olat.core.gui.control.controller.BasicController;
-import org.olat.core.util.nodes.INode;
 import org.olat.course.CourseFactory;
 import org.olat.course.ICourse;
 
+import uk.ac.ed.ph.jqtiplus.node.test.AssessmentItemRef;
+
 /**
  * 
  * Initial date: 13 févr. 2017<br>
@@ -43,6 +44,7 @@ import org.olat.course.ICourse;
  */
 public class QTI21PrintController extends BasicController {
 
+	private int count = 0;
 	private final VelocityContainer mainVC;
 	
 	public QTI21PrintController(UserRequest ureq, WindowControl wControl, QTI21StatisticResourceResult resourceResult) {
@@ -69,28 +71,31 @@ public class QTI21PrintController extends BasicController {
 		String testTitle = resourceResult.getTestEntry().getDisplayname();
 		mainVC.contextPut("testTitle", testTitle);
 		
-		int count = 0;
 		List<String> pageNames = new ArrayList<>();
-
+		// append the root for informations
 		Controller assessmentCtrl = resourceResult.getController(ureq, getWindowControl(), null, rootNode, true);
-		
 		String pageName = "page" + count++;
 		mainVC.put(pageName, assessmentCtrl.getInitialComponent());
 		pageNames.add(pageName);
+		// append all assessment items
+		appendNodes(ureq, rootNode, resourceResult, pageNames);
 
-		for(int i=0; i<rootNode.getChildCount(); i++) {
-			INode sectionNode = rootNode.getChildAt(i);
-			for(int j=0; j<sectionNode.getChildCount(); j++) {
-				TreeNode itemNode = (TreeNode)sectionNode.getChildAt(j);
-				Controller itemCtrl = resourceResult.getController(ureq, getWindowControl(), null, itemNode, true);
-				
+		mainVC.contextPut("pageNames", pageNames);
+	}
+	
+	private void appendNodes(UserRequest ureq, TreeNode node, QTI21StatisticResourceResult resourceResult, List<String> pageNames) {
+		if(node.getUserObject() instanceof AssessmentItemRef) {
+			Controller itemCtrl = resourceResult.getController(ureq, getWindowControl(), null, node, true);
+			if(itemCtrl != null) {
 				String itemPageName = "page" + count++;
 				mainVC.put(itemPageName, itemCtrl.getInitialComponent());
 				pageNames.add(itemPageName);
 			}
 		}
-
-		mainVC.contextPut("pageNames", pageNames);
+		
+		for(int i=0; i<node.getChildCount(); i++) {
+			appendNodes(ureq, (TreeNode)node.getChildAt(i), resourceResult, pageNames);
+		}
 	}
 	
 	@Override

src/main/java/org/olat/repository/ui/author/CatalogSettingsController.java

@@ -87,7 +87,6 @@ public class CatalogSettingsController extends FormBasicController {
 	public void initToolbar() {
 		addToCatalogLink = LinkFactory.createToolLink("cat", translate("details.catadd"), this, "o_icon_add");
 		addToCatalogLink.setElementCssClass("o_sel_repo_add_to_catalog");
-		addToCatalogLink.setEnabled((entry.getAccess() >= RepositoryEntry.ACC_USERS || entry.isMembersOnly()));
 		stackPanel.addTool(addToCatalogLink, Align.left);
 	}