Merge branch 'OpenOLAT_12.5' of...

Merge branch 'OpenOLAT_12.5' of ssh://uhensler@office.frentix.com/home/uhensler/repositories/OpenOLAT.git

Conflicts:
	src/main/resources/serviceconfig/olat.properties
	src/main/webapp/static/themes/light/content.css
	src/main/webapp/static/themes/light/content.css.map
	src/main/webapp/static/themes/light/theme.css
	src/main/webapp/static/themes/light/theme.css.map
	src/main/webapp/static/themes/openolat/content.css
	src/main/webapp/static/themes/openolat/content.css.map
	src/main/webapp/static/themes/openolat/theme.css
	src/main/webapp/static/themes/openolat/theme.css.map

src/main/java/org/olat/ims/qti21/ui/_content/assessment_results.html

@@ -539,10 +539,11 @@
 #if($printCommand)
 <script type="text/javascript">
 /* <![CDATA[ */ 
-	jQuery(function() {
+	// execute after radial score rendering
+	setTimeout(function() {
 		window.focus();
 		window.print();
-	});
+	},110);
 /* ]]> */
 </script>
 #end

src/main/java/org/olat/modules/qpool/manager/QuestionPoolServiceImpl.java

@@ -943,6 +943,7 @@ public class QuestionPoolServiceImpl implements QPoolService {
 		}
 	}
 	
+	@Override
 	public Taxonomy getQPoolTaxonomy() {
 		TaxonomyRef ref = getQPoolTaxonomyRef() ;
 		return ref == null ? null: taxonomyDao.loadByKey(ref.getKey());

src/main/java/org/olat/modules/qpool/ui/PoolsController.java

@@ -25,7 +25,6 @@ import java.util.List;
 import java.util.Set;
 
 import org.olat.core.CoreSpringFactory;
-import org.olat.core.commons.persistence.ResultInfos;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.form.flexible.FormItem;
 import org.olat.core.gui.components.form.flexible.FormItemContainer;
@@ -103,8 +102,8 @@ public class PoolsController extends FormBasicController {
 		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(true, Cols.publicPool.i18nKey(), Cols.publicPool.ordinal(),
 				true, "publicPool", FlexiColumnModel.ALIGNMENT_LEFT,
 				new BooleanCellRenderer(
-						new CSSIconFlexiCellRenderer("o_public"),
-						new CSSIconFlexiCellRenderer("o_private"))
+						new CSSIconFlexiCellRenderer("o_icon_pool_public"),
+						new CSSIconFlexiCellRenderer("o_icon_pool_private"))
 		));
 		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.name.i18nKey(), Cols.name.ordinal(), true, "name"));
 		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel("select", translate("select"), "select-pool"));
@@ -113,7 +112,7 @@ public class PoolsController extends FormBasicController {
 		poolTable = uifactory.addTableElement(getWindowControl(), "pools", model, getTranslator(), formLayout);
 		poolTable.setMultiSelect(true);
 		poolTable.setRendererType(FlexiTableRendererType.classic);
-		reloadModel();
+		reloadModel(ureq);
 		
 		FormLayoutContainer buttonsCont = FormLayoutContainer.createButtonLayout("buttons", getTranslator());
 		buttonsCont.setRootForm(mainForm);
@@ -122,9 +121,9 @@ public class PoolsController extends FormBasicController {
 		uifactory.addFormCancelButton("cancel", buttonsCont, ureq, getWindowControl());
 	}
 	
-	private void reloadModel() {
-		ResultInfos<Pool> pools = qpoolService.getPools(0,	-1);
-		model.setObjects(pools.getObjects());
+	private void reloadModel(UserRequest ureq) {
+		List<Pool> pools = qpoolService.getPools(getIdentity(), ureq.getUserSession().getRoles());
+		model.setObjects(pools);
 		poolTable.reset();
 	}
 
@@ -141,7 +140,7 @@ public class PoolsController extends FormBasicController {
 		} else if(source == selectButton) {
 			Set<Integer> selectIndexes = poolTable.getMultiSelectedIndex();
 			if(!selectIndexes.isEmpty()) {
-				List<Pool> rows = new ArrayList<Pool>(selectIndexes.size());
+				List<Pool> rows = new ArrayList<>(selectIndexes.size());
 				for(Integer index:selectIndexes) {
 					Pool row = model.getObject(index.intValue());
 					rows.add(row);
@@ -225,7 +224,7 @@ public class PoolsController extends FormBasicController {
 	
 		@Override
 		public void setObjects(List<Pool> objects) {
-			rows = new ArrayList<Pool>(objects);
+			rows = new ArrayList<>(objects);
 		}
 	
 		@Override

src/main/resources/serviceconfig/olat.properties

@@ -1190,8 +1190,13 @@ ldap.learningResourceManagerRoleValue=
 # Build properties
 #####
 application.name=OpenOLAT
+<<<<<<< HEAD
 build.version=13.0b3
 build.identifier=openolat130b3-dev
+=======
+build.version=12.5.4
+build.identifier=openolat1254-dev
+>>>>>>> branch 'OpenOLAT_12.5' of ssh://uhensler@office.frentix.com/home/uhensler/repositories/OpenOLAT.git
 build.repo.revision=local-devel
 
 #####

src/main/webapp/static/themes/light/modules/_print.scss

@@ -178,7 +178,7 @@
 			OO Layout is designed for mobile-first, thus everything is a bit large for printing 
 			might not work on FF, but hey, better than nothing
 		*/
-		zoom: 0.75;
+		zoom: 0.6;
 	}
 	
 	table, figure, figure {