diff --git a/.hgtags b/.hgtags
index 4cacfdb3d81cff4649fa10bf02a1d3c1c89a74c6..b09320d1a2394fe84663f8af37d7ee7cfd34e861 100644
--- a/.hgtags
+++ b/.hgtags
@@ -51,3 +51,4 @@ d648ff338d691e8eac01c4d6ac37c538078fa8b1 OpenOLAT 8.4.1
f5d7015694faaaa4c3e18ad635420537c6f1a29f OpenOLAT 9.0.0
7d3043abd58899a3b824d6a3cdc913f6d0c76228 OpenOLAT 9.0.1
c609c181842526791f06e024ff1bbefa57c2acee OpenOLAT 9.0.2
+c7df76e9d0a39a32fdb11a0512dcbfd5b9937ea2 OpenOLAT 9.0.3
diff --git a/src/main/java/org/olat/commons/info/portlet/InfoMessagePortlet.java b/src/main/java/org/olat/commons/info/portlet/InfoMessagePortlet.java
index 8adc18b70907288a9b00fa13b7d732ac14dc494a..290008c46b0a5428fefe2ebddacf8c898e71de56 100644
--- a/src/main/java/org/olat/commons/info/portlet/InfoMessagePortlet.java
+++ b/src/main/java/org/olat/commons/info/portlet/InfoMessagePortlet.java
@@ -56,16 +56,17 @@ public class InfoMessagePortlet extends AbstractPortlet {
@Override
public Portlet createInstance(WindowControl wControl, UserRequest ureq, Map<String,String> portletConfig) {
Translator translator = Util.createPackageTranslator(InfoMessagePortlet.class, ureq.getLocale());
- Portlet p = new InfoMessagePortlet();
+ InfoMessagePortlet p = new InfoMessagePortlet();
p.setName(getName());
p.setTranslator(translator);
+ p.setDefaultMaxEntries(getDefaultMaxEntries());
return p;
}
@Override
public Component getInitialRunComponent(WindowControl wControl, UserRequest ureq) {
if(runCtrl != null) runCtrl.dispose();
- runCtrl = new InfoMessagePortletRunController(wControl, ureq, getTranslator(), getName());
+ runCtrl = new InfoMessagePortletRunController(wControl, ureq, getTranslator(), getName(), getDefaultMaxEntries());
return runCtrl.getInitialComponent();
}
@@ -90,7 +91,7 @@ public class InfoMessagePortlet extends AbstractPortlet {
@Override
public PortletToolController<InfoSubscriptionItem> getTools(UserRequest ureq, WindowControl wControl) {
if (runCtrl == null ) {
- runCtrl = new InfoMessagePortletRunController(wControl, ureq, getTranslator(), getName());
+ runCtrl = new InfoMessagePortletRunController(wControl, ureq, getTranslator(), getName(), getDefaultMaxEntries());
}
return runCtrl.createSortingTool(ureq, wControl);
}
diff --git a/src/main/java/org/olat/commons/info/portlet/InfoMessagePortletRunController.java b/src/main/java/org/olat/commons/info/portlet/InfoMessagePortletRunController.java
index 6373da07c1c3a0af08382c12aa2c6b3243540b36..b68e832696061bd08355b960e85bd30f12b24608 100644
--- a/src/main/java/org/olat/commons/info/portlet/InfoMessagePortletRunController.java
+++ b/src/main/java/org/olat/commons/info/portlet/InfoMessagePortletRunController.java
@@ -76,8 +76,9 @@ public class InfoMessagePortletRunController extends AbstractPortletRunControlle
private TableController tableController;
private VelocityContainer portletVC;
- public InfoMessagePortletRunController(WindowControl wControl, UserRequest ureq, Translator trans, String portletName) {
- super(wControl, ureq, trans, portletName);
+ public InfoMessagePortletRunController(WindowControl wControl, UserRequest ureq, Translator trans,
+ String portletName, int defaultMaxentries) {
+ super(wControl, ureq, trans, portletName, defaultMaxentries);
portletVC = createVelocityContainer("infosPortlet");
showAllLink = LinkFactory.createLink("portlet.showall", portletVC, this);
@@ -112,7 +113,7 @@ public class InfoMessagePortletRunController extends AbstractPortletRunControlle
@Override
protected SortingCriteria createDefaultSortingCriteria() {
- SortingCriteria sortingCriteria = new SortingCriteria(this.sortingTermsList);
+ SortingCriteria sortingCriteria = new SortingCriteria(sortingTermsList, getDefaultMaxEntries());
sortingCriteria.setAscending(false);
return sortingCriteria;
}
diff --git a/src/main/java/org/olat/core/commons/services/mark/ui/BookmarksPortlet.java b/src/main/java/org/olat/core/commons/services/mark/ui/BookmarksPortlet.java
index 9586016ef2f0834d10e705463b885dacb97b3eb1..b0619b97803bab17f58a63c0c51f5ba33aff6587 100644
--- a/src/main/java/org/olat/core/commons/services/mark/ui/BookmarksPortlet.java
+++ b/src/main/java/org/olat/core/commons/services/mark/ui/BookmarksPortlet.java
@@ -51,9 +51,10 @@ public class BookmarksPortlet extends AbstractPortlet {
*/
public Portlet createInstance(WindowControl wControl, UserRequest ureq, Map<String,String> configuration) {
Translator translator = Util.createPackageTranslator(BookmarksPortlet.class, ureq.getLocale());
- Portlet p = new BookmarksPortlet();
+ BookmarksPortlet p = new BookmarksPortlet();
p.setName(this.getName());
- p.setConfiguration(configuration);
+ p.setConfiguration(configuration);
+ p.setDefaultMaxEntries(getDefaultMaxEntries());
p.setTranslator(translator);
return p;
}
@@ -76,9 +77,9 @@ public class BookmarksPortlet extends AbstractPortlet {
* @see org.olat.gui.control.generic.portal.Portlet#getInitialRunComponent(org.olat.core.gui.control.WindowControl, org.olat.core.gui.UserRequest)
*/
public Component getInitialRunComponent(WindowControl wControl, UserRequest ureq) {
- if(this.runCtr != null) runCtr.dispose();
- this.runCtr = new BookmarksPortletRunController(wControl, ureq, getTranslator(), this.getName());
- return this.runCtr.getInitialComponent();
+ if(runCtr != null) runCtr.dispose();
+ runCtr = new BookmarksPortletRunController(wControl, ureq, getTranslator(), getName(), getDefaultMaxEntries());
+ return runCtr.getInitialComponent();
}
/**
@@ -107,7 +108,7 @@ public class BookmarksPortlet extends AbstractPortlet {
public PortletToolController<Bookmark> getTools(UserRequest ureq, WindowControl wControl) {
if (runCtr == null ) {
- this.runCtr = new BookmarksPortletRunController(wControl, ureq, getTranslator(), this.getName());
+ runCtr = new BookmarksPortletRunController(wControl, ureq, getTranslator(), getName(), getDefaultMaxEntries());
}
return runCtr.createSortingTool(ureq, wControl);
}
diff --git a/src/main/java/org/olat/core/commons/services/mark/ui/BookmarksPortletRunController.java b/src/main/java/org/olat/core/commons/services/mark/ui/BookmarksPortletRunController.java
index cb9fc77ed3e3f07fd1b2c0c1fa176a6c4bc3ae11..f811dc2c97182a70b8ec5ed298550554aa2666db 100644
--- a/src/main/java/org/olat/core/commons/services/mark/ui/BookmarksPortletRunController.java
+++ b/src/main/java/org/olat/core/commons/services/mark/ui/BookmarksPortletRunController.java
@@ -91,8 +91,9 @@ public class BookmarksPortletRunController extends AbstractPortletRunController<
* @param ureq
* @param component
*/
- public BookmarksPortletRunController(WindowControl wControl, UserRequest ureq, Translator trans, String portletName) {
- super(wControl, ureq, trans, portletName);
+ public BookmarksPortletRunController(WindowControl wControl, UserRequest ureq, Translator trans,
+ String portletName, int defaultMaxEntries) {
+ super(wControl, ureq, trans, portletName, defaultMaxEntries);
sortingTermsList.add(SortingCriteria.TYPE_SORTING);
sortingTermsList.add(SortingCriteria.ALPHABETICAL_SORTING);
sortingTermsList.add(SortingCriteria.DATE_SORTING);
diff --git a/src/main/java/org/olat/core/gui/control/_spring/portalContext.xml b/src/main/java/org/olat/core/gui/control/_spring/portalContext.xml
index 251a3b74e7303b0d03046c73d9e8f1028fbea528..744362313b7f4d722a3d4e5563e47a6ab1f2259c 100644
--- a/src/main/java/org/olat/core/gui/control/_spring/portalContext.xml
+++ b/src/main/java/org/olat/core/gui/control/_spring/portalContext.xml
@@ -109,6 +109,7 @@
<bean id="RepositoryPortletStudent" class="org.olat.repository.portlet.RepositoryPortlet" scope="prototype">
<property name="name" value="RepositoryPortletStudent" />
<property name="enabled" value="${portlet.repository.student.enabled}" />
+ <property name="defaultMaxEntries" value="${portlet.repository.student.entries}" />
<property name="configuration">
<map>
<entry key="role" value="student" />
@@ -119,6 +120,7 @@
<bean id="RepositoryPortletTeacher" class="org.olat.repository.portlet.RepositoryPortlet" scope="prototype">
<property name="name" value="RepositoryPortletTeacher" />
<property name="enabled" value="${portlet.repository.teacher.enabled}" />
+ <property name="defaultMaxEntries" value="${portlet.repository.teacher.entries}" />
<property name="configuration">
<map>
<entry key="role" value="teacher" />
diff --git a/src/main/java/org/olat/core/gui/control/generic/portal/AbstractPortlet.java b/src/main/java/org/olat/core/gui/control/generic/portal/AbstractPortlet.java
index a1be22481839d5fbb37452290fb53a55efaadd82..f04f8068d1b6d5c518e4c2e6eb3267bac51c52c7 100644
--- a/src/main/java/org/olat/core/gui/control/generic/portal/AbstractPortlet.java
+++ b/src/main/java/org/olat/core/gui/control/generic/portal/AbstractPortlet.java
@@ -45,6 +45,7 @@ public abstract class AbstractPortlet extends AbstractConfigOnOff implements Por
private Map<String,String> configuration = new HashMap<String,String>();
private String name;
private Translator trans;
+ private int defaultMaxEntries = 6;
/**
* @return The configuration map
@@ -75,6 +76,14 @@ public abstract class AbstractPortlet extends AbstractConfigOnOff implements Por
this.name = name;
}
+ public int getDefaultMaxEntries() {
+ return defaultMaxEntries;
+ }
+
+ public void setDefaultMaxEntries(int defaultMaxEntries) {
+ this.defaultMaxEntries = defaultMaxEntries;
+ }
+
/**
* @see org.olat.core.gui.control.generic.portal.Portlet#setTranslator(org.olat.core.gui.translator.Translator)
*/
diff --git a/src/main/java/org/olat/core/gui/control/generic/portal/AbstractPortletRunController.java b/src/main/java/org/olat/core/gui/control/generic/portal/AbstractPortletRunController.java
index 00a1e2d285e8f527d8cad9772f44da7a30d1f1e2..5654e5908209bc61bb6a4f9c5eda1391fc0d317a 100644
--- a/src/main/java/org/olat/core/gui/control/generic/portal/AbstractPortletRunController.java
+++ b/src/main/java/org/olat/core/gui/control/generic/portal/AbstractPortletRunController.java
@@ -59,16 +59,22 @@ public abstract class AbstractPortletRunController<T> extends BasicController {
protected ArrayList<Integer> sortingTermsList = new ArrayList<Integer>();
private final String portletName;
protected final Preferences guiPreferences;
+ private final int defaultMaxEntries;
- public AbstractPortletRunController(WindowControl wControl, UserRequest ureq, Translator trans, String portletName) {
+ public AbstractPortletRunController(WindowControl wControl, UserRequest ureq, Translator trans,
+ String portletName, int defaultMaxEntries) {
super(ureq, wControl, trans);
collator = Collator.getInstance();
- this.portletName = portletName;
+ this.portletName = portletName;
+ this.defaultMaxEntries = defaultMaxEntries;
this.guiPreferences = ureq.getUserSession().getGuiPreferences();
}
-
+ public int getDefaultMaxEntries() {
+ return defaultMaxEntries;
+ }
+
/**
* Handles portletToolsController events.
*/
@@ -100,7 +106,7 @@ public abstract class AbstractPortletRunController<T> extends BasicController {
Map<Long, Integer> storedPrefs = (Map<Long, Integer>) guiPreferences.get(Map.class, getPreferenceKey(this.SORTED_ITEMS_PREF));
if (storedPrefs != null) {
//if auto sorting choosed, remove any manually sorting info
- List sortedItems = new ArrayList();
+ List<PortletEntry<T>> sortedItems = new ArrayList<PortletEntry<T>>();
guiPreferences.putAndSave(Map.class, getPreferenceKey(SORTED_ITEMS_PREF), getSortedItemsMap(sortedItems));
}
}
@@ -118,10 +124,10 @@ public abstract class AbstractPortletRunController<T> extends BasicController {
SortingCriteria returnSortingCriteria = null;
Preferences guiPreferences = ureq.getUserSession().getGuiPreferences();
- Object storedPrefs = guiPreferences.get(Map.class, getPreferenceKey(SORTING_CRITERIA_PREF));
+ Map<String, Integer> storedPrefs = (Map<String, Integer>)guiPreferences.get(Map.class, getPreferenceKey(SORTING_CRITERIA_PREF));
if (storedPrefs != null) {
- returnSortingCriteria = new SortingCriteria((Map<String, Integer>) storedPrefs, sortingTermsList);
+ returnSortingCriteria = new SortingCriteria( storedPrefs, sortingTermsList, defaultMaxEntries);
} else {
returnSortingCriteria = createDefaultSortingCriteria();
}
@@ -129,7 +135,7 @@ public abstract class AbstractPortletRunController<T> extends BasicController {
}
protected SortingCriteria createDefaultSortingCriteria() {
- return new SortingCriteria(this.sortingTermsList);
+ return new SortingCriteria(sortingTermsList, defaultMaxEntries);
}
/**
diff --git a/src/main/java/org/olat/core/gui/control/generic/portal/PortletAutoSortingConfigurator.java b/src/main/java/org/olat/core/gui/control/generic/portal/PortletAutoSortingConfigurator.java
index 6f56378ee07202f7fbfbd7c21474b2301505555d..a874ae5f62b8260fb46709b3abcc918799d26049 100644
--- a/src/main/java/org/olat/core/gui/control/generic/portal/PortletAutoSortingConfigurator.java
+++ b/src/main/java/org/olat/core/gui/control/generic/portal/PortletAutoSortingConfigurator.java
@@ -78,14 +78,12 @@ public class PortletAutoSortingConfigurator extends FormBasicController{
@Override
protected void doDispose() {
- // TODO Auto-generated method stub
-
+ //
}
-
@Override
protected void formOK(UserRequest ureq) {
- sortingCriteria = new SortingCriteria(sortingCriteria.getSortingTermsList());
+ sortingCriteria = new SortingCriteria(sortingCriteria.getSortingTermsList(), sortingCriteria.getMaxEntries());
try {
int maxEntries = entriesNum.getIntValue();
sortingCriteria.setMaxEntries(maxEntries);
@@ -95,7 +93,6 @@ public class PortletAutoSortingConfigurator extends FormBasicController{
String selectedSortingTermKey = sortingCriteriaSelection.getSelectedKey();
sortingCriteria.setSortingTerm(Integer.valueOf(selectedSortingTermKey).intValue());
-
sortingCriteria.setAscending(sortingDirectionSelection.getSelectedKey().equals(ASCENDING));
fireEvent(ureq, Event.DONE_EVENT);
diff --git a/src/main/java/org/olat/core/gui/control/generic/portal/SortingCriteria.java b/src/main/java/org/olat/core/gui/control/generic/portal/SortingCriteria.java
index 1cdb046b0328394dd5641bc4e275980af6d42ae1..6c75ba7ebeae5431915a0b0a01ee29d9e0163e8b 100644
--- a/src/main/java/org/olat/core/gui/control/generic/portal/SortingCriteria.java
+++ b/src/main/java/org/olat/core/gui/control/generic/portal/SortingCriteria.java
@@ -69,8 +69,8 @@ public class SortingCriteria {
* Auto sorting constructor.
*
*/
- public SortingCriteria(List<Integer> sortingTermsList) {
- this(AUTO_SORTING,6,ALPHABETICAL_SORTING,true, sortingTermsList);
+ public SortingCriteria(List<Integer> sortingTermsList, int maxEntries) {
+ this(AUTO_SORTING, maxEntries, ALPHABETICAL_SORTING, true, sortingTermsList);
}
private SortingCriteria(int sortingType, int maxEntries, int sortingTerm, boolean ascending, List<Integer> sortingTermsList) {
@@ -81,15 +81,15 @@ public class SortingCriteria {
this.sortingTermsList = sortingTermsList;
}
- public SortingCriteria(Map<String,Integer> paramMap, List<Integer> sortingTermsList) {
- this(sortingTermsList);
+ public SortingCriteria(Map<String,Integer> paramMap, List<Integer> sortingTermsList, int defaultMaxEntries) {
+ this(sortingTermsList, defaultMaxEntries);
if(paramMap!=null) {
if(paramMap.containsKey(SORTING_TYPE_KEY)) {
- this.setSortingType(paramMap.get(SORTING_TYPE_KEY));
- if(this.getSortingType()==AUTO_SORTING) {
- this.maxEntries = paramMap.get(NUM_ENTRIES_KEY);
- this.ascending = paramMap.get(SORTING_DIRECTION)==1;
- this.setSortingTerm(paramMap.get(SORTING_TERM_KEY));
+ setSortingType(paramMap.get(SORTING_TYPE_KEY));
+ if(getSortingType()==AUTO_SORTING) {
+ maxEntries = paramMap.get(NUM_ENTRIES_KEY);
+ ascending = paramMap.get(SORTING_DIRECTION)==1;
+ setSortingTerm(paramMap.get(SORTING_TERM_KEY));
}
}
}
@@ -107,7 +107,7 @@ public class SortingCriteria {
*
* @return a Map with the current sortingCriteria attribute values.
*/
- public Map getPersistable() {
+ public Map<String, Integer> getPersistable() {
Map<String, Integer> returnMap = new Hashtable<String, Integer>();
if (AUTO_SORTING == this.getSortingType()) {
returnMap.put(SORTING_TYPE_KEY, AUTO_SORTING);
diff --git a/src/main/java/org/olat/course/assessment/EfficiencyStatementsPortlet.java b/src/main/java/org/olat/course/assessment/EfficiencyStatementsPortlet.java
index f7a5777966c8100324c2ef7fa391de94bb6e5788..6bc43fa7b748b832fe3a039bb1c241b68233f481 100644
--- a/src/main/java/org/olat/course/assessment/EfficiencyStatementsPortlet.java
+++ b/src/main/java/org/olat/course/assessment/EfficiencyStatementsPortlet.java
@@ -52,9 +52,10 @@ public class EfficiencyStatementsPortlet extends AbstractPortlet {
*/
public Portlet createInstance(WindowControl wControl, UserRequest ureq, Map<String,String> configuration) {
Translator translator = Util.createPackageTranslator(EfficiencyStatementsPortlet.class, ureq.getLocale());
- Portlet p = new EfficiencyStatementsPortlet();
+ EfficiencyStatementsPortlet p = new EfficiencyStatementsPortlet();
p.setName(this.getName());
p.setConfiguration(configuration);
+ p.setDefaultMaxEntries(getDefaultMaxEntries());
p.setTranslator(translator);
return p;
}
@@ -77,9 +78,9 @@ public class EfficiencyStatementsPortlet extends AbstractPortlet {
* @see org.olat.gui.control.generic.portal.Portlet#getInitialRunComponent(org.olat.core.gui.control.WindowControl, org.olat.core.gui.UserRequest)
*/
public Component getInitialRunComponent(WindowControl wControl, UserRequest ureq) {
- if(this.runCtr != null) runCtr.dispose();
- this.runCtr = new EfficiencyStatementsPortletRunController(wControl, ureq, getTranslator(), this.getName());
- return this.runCtr.getInitialComponent();
+ if(runCtr != null) runCtr.dispose();
+ runCtr = new EfficiencyStatementsPortletRunController(wControl, ureq, getTranslator(), getName(), getDefaultMaxEntries());
+ return runCtr.getInitialComponent();
}
/**
@@ -108,7 +109,7 @@ public class EfficiencyStatementsPortlet extends AbstractPortlet {
public PortletToolController<UserEfficiencyStatementLight> getTools(UserRequest ureq, WindowControl wControl) {
if (runCtr == null) {
- this.runCtr = new EfficiencyStatementsPortletRunController(wControl, ureq, getTranslator(), this.getName());
+ runCtr = new EfficiencyStatementsPortletRunController(wControl, ureq, getTranslator(), getName(), getDefaultMaxEntries());
}
return runCtr.createSortingTool(ureq, wControl);
}
diff --git a/src/main/java/org/olat/course/assessment/EfficiencyStatementsPortletRunController.java b/src/main/java/org/olat/course/assessment/EfficiencyStatementsPortletRunController.java
index 0a1e200e4ca03f04542abf6854a196f48eac3552..4f4b656552f253cb5cd6fae54e6ff8e69c5b1b8d 100644
--- a/src/main/java/org/olat/course/assessment/EfficiencyStatementsPortletRunController.java
+++ b/src/main/java/org/olat/course/assessment/EfficiencyStatementsPortletRunController.java
@@ -85,8 +85,9 @@ public class EfficiencyStatementsPortletRunController extends AbstractPortletRun
* @param ureq
* @param component
*/
- public EfficiencyStatementsPortletRunController(WindowControl wControl, UserRequest ureq, Translator trans, String portletName) {
- super(wControl, ureq, trans, portletName);
+ public EfficiencyStatementsPortletRunController(WindowControl wControl, UserRequest ureq, Translator trans,
+ String portletName, int defaultMaxEntries) {
+ super(wControl, ureq, trans, portletName, defaultMaxEntries);
this.cOwner = ureq.getIdentity();
sortingTermsList.add(SortingCriteria.ALPHABETICAL_SORTING);
diff --git a/src/main/java/org/olat/course/nodes/basiclti/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/nodes/basiclti/_i18n/LocalStrings_de.properties
index cfa446280c527b54e0d05271112eb65d1fbcc955..ecff3e82cbfa883b5bd8bda90458364e62bc382e 100644
--- a/src/main/java/org/olat/course/nodes/basiclti/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/nodes/basiclti/_i18n/LocalStrings_de.properties
@@ -4,12 +4,12 @@ accept=Ich stimme der Daten
title_lti=LTI-Seite
LTConfigForm.invalidurl=Bitte geben Sie eine g\u00FCltige URL an.
LTConfigForm.key=Schlüssel
-LTConfigForm.key.example=Beispiel: lmsng.school.edu
+LTConfigForm.key.example=Beispiel: jisc.ac.uk
LTConfigForm.pass=Passwort
LTConfigForm.pass.example=Beispiel: secret
LTConfigForm.save=Speichern
LTConfigForm.url=URL
-LTConfigForm.url.example=Beispiel: http://www.imsglobal.org/developers/BLTI/tool.php
+LTConfigForm.url.example=Beispiel: http://ltiapps.net/test/tp.php
LTConfigForm.user=Benutzername
error.hostmissing.long=F\u00FCr die externe Seite "{0}" muss ein Host im Tab "Seiteninhalt" konfiguriert werden.
error.hostmissing.short=Es ist kein Host angegeben f\u00FCr "{0}".
diff --git a/src/main/java/org/olat/course/nodes/basiclti/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/nodes/basiclti/_i18n/LocalStrings_en.properties
index 230ec82d6cb59fe49fca836300ba023a27107c89..5ac47249627fc669461110867670b4ec50249760 100644
--- a/src/main/java/org/olat/course/nodes/basiclti/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/nodes/basiclti/_i18n/LocalStrings_en.properties
@@ -1,7 +1,7 @@
#Fri Jun 28 17:11:37 CEST 2013
LTConfigForm.invalidurl=Please indicate a valid URL.
LTConfigForm.key=Key
-LTConfigForm.key.example=Example\: lmsng.school.edu
+LTConfigForm.key.example=Example\: jisc.ac.uk
LTConfigForm.pass=Password
LTConfigForm.pass.example=Example\: secret
LTConfigForm.save=Save
diff --git a/src/main/java/org/olat/course/nodes/basiclti/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/nodes/basiclti/_i18n/LocalStrings_fr.properties
index 60a3a3044d955af340d31e3e0acbcfb190df78c0..2864575a3d7394d496f1a96436273df49e86ff30 100644
--- a/src/main/java/org/olat/course/nodes/basiclti/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/course/nodes/basiclti/_i18n/LocalStrings_fr.properties
@@ -1,7 +1,7 @@
#Mon Oct 22 16:26:54 CEST 2012
LTConfigForm.invalidurl=Indiquez une URL valable, svp.
LTConfigForm.key=Cl\u00E9
-LTConfigForm.key.example=Exemple\: lmsng.school.edu
+LTConfigForm.key.example=Exemple\: jisc.ac.uk
LTConfigForm.pass=Mot de passe
LTConfigForm.pass.example=Exemple\: secret
LTConfigForm.save=Enregistrer
diff --git a/src/main/java/org/olat/course/nodes/basiclti/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/course/nodes/basiclti/_i18n/LocalStrings_it.properties
index 37466ddb119180ded930c55a0d94864f2cdc0b40..e12709aceb0304632f2313e94775fe1d90045b20 100644
--- a/src/main/java/org/olat/course/nodes/basiclti/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/course/nodes/basiclti/_i18n/LocalStrings_it.properties
@@ -1,7 +1,7 @@
#Fri Jan 21 15:46:02 CET 2011
LTConfigForm.invalidurl=Indichi un URL valido, p.f.
LTConfigForm.key=Chiave
-LTConfigForm.key.example=Esempio\: lmsng.school.edu
+LTConfigForm.key.example=Esempio\: jisc.ac.uk
LTConfigForm.pass=Password
LTConfigForm.pass.example=Esempio\: secret
LTConfigForm.save=Salvare
diff --git a/src/main/java/org/olat/course/nodes/basiclti/_i18n/LocalStrings_nl_NL.properties b/src/main/java/org/olat/course/nodes/basiclti/_i18n/LocalStrings_nl_NL.properties
index c80f0162cad9b21be16094d948508243e72b4d77..ef6707d3b18b7fd846839da543e80fc7c58fa1c9 100644
--- a/src/main/java/org/olat/course/nodes/basiclti/_i18n/LocalStrings_nl_NL.properties
+++ b/src/main/java/org/olat/course/nodes/basiclti/_i18n/LocalStrings_nl_NL.properties
@@ -1,7 +1,7 @@
#Thu Sep 08 16:42:44 CEST 2011
LTConfigForm.invalidurl=Gelieve een geldige URL aan te geven.
LTConfigForm.key=Sleutel
-LTConfigForm.key.example=Voorbeeld\: lmsng.school.edu
+LTConfigForm.key.example=Voorbeeld\: jisc.ac.uk
LTConfigForm.pass=Wachtwoord
LTConfigForm.pass.example=Voorbeeld\: secret
LTConfigForm.save=Opslaan
diff --git a/src/main/java/org/olat/group/ui/portlet/GroupsPortlet.java b/src/main/java/org/olat/group/ui/portlet/GroupsPortlet.java
index 889294b8301524277d8fd67d94763c64b28ce963..467653017cc892b91cb98b8eddc97330f30c9676 100644
--- a/src/main/java/org/olat/group/ui/portlet/GroupsPortlet.java
+++ b/src/main/java/org/olat/group/ui/portlet/GroupsPortlet.java
@@ -54,9 +54,10 @@ public class GroupsPortlet extends AbstractPortlet {
*/
public Portlet createInstance(WindowControl wControl, UserRequest ureq, Map<String,String> configuration) {
Translator translator = Util.createPackageTranslator(BGControllerFactory.class, ureq.getLocale());
- Portlet p = new GroupsPortlet();
+ GroupsPortlet p = new GroupsPortlet();
p.setName(this.getName());
p.setConfiguration(configuration);
+ p.setDefaultMaxEntries(getDefaultMaxEntries());
p.setTranslator(translator);
return p;
}
@@ -83,7 +84,7 @@ public class GroupsPortlet extends AbstractPortlet {
if(runCtr != null) {
runCtr.dispose();
}
- runCtr = new GroupsPortletRunController(wControl, ureq, getTranslator(), this.getName());
+ runCtr = new GroupsPortletRunController(wControl, ureq, getTranslator(), getName(), getDefaultMaxEntries());
return runCtr.getInitialComponent();
}
@@ -114,7 +115,7 @@ public class GroupsPortlet extends AbstractPortlet {
public PortletToolController<BusinessGroupEntry> getTools(UserRequest ureq, WindowControl wControl) {
//portlet was not yet visible
if ( runCtr == null ) {
- runCtr = new GroupsPortletRunController(wControl, ureq, getTranslator(), this.getName());
+ runCtr = new GroupsPortletRunController(wControl, ureq, getTranslator(), getName(), getDefaultMaxEntries());
}
return runCtr.createSortingTool(ureq, wControl);
}
diff --git a/src/main/java/org/olat/group/ui/portlet/GroupsPortletRunController.java b/src/main/java/org/olat/group/ui/portlet/GroupsPortletRunController.java
index 5407605f9baadcfdae4f843d42e7087c9fecb5f0..0887d38d7bff3d31633d91a968f540b7421481f7 100644
--- a/src/main/java/org/olat/group/ui/portlet/GroupsPortletRunController.java
+++ b/src/main/java/org/olat/group/ui/portlet/GroupsPortletRunController.java
@@ -91,8 +91,9 @@ public class GroupsPortletRunController extends AbstractPortletRunController<Bus
* @param ureq
* @param component
*/
- public GroupsPortletRunController(WindowControl wControl, UserRequest ureq, Translator trans, String portletName) {
- super(wControl, ureq, trans, portletName);
+ public GroupsPortletRunController(WindowControl wControl, UserRequest ureq, Translator trans,
+ String portletName, int defaultMaxEntries) {
+ super(wControl, ureq, trans, portletName, defaultMaxEntries);
businessGroupService = CoreSpringFactory.getImpl(BusinessGroupService.class);
diff --git a/src/main/java/org/olat/note/NotesPortlet.java b/src/main/java/org/olat/note/NotesPortlet.java
index db4576b92f517eb68ff9c1924f83c2c2519c2c78..fb9212670b8ff75aa74c35151cc7a46d81fe6c8c 100644
--- a/src/main/java/org/olat/note/NotesPortlet.java
+++ b/src/main/java/org/olat/note/NotesPortlet.java
@@ -51,9 +51,10 @@ public class NotesPortlet extends AbstractPortlet {
*/
public Portlet createInstance(WindowControl wControl, UserRequest ureq, Map<String,String> configuration) {
Translator translator = Util.createPackageTranslator(NotesPortlet.class, ureq.getLocale());
- Portlet p = new NotesPortlet();
+ NotesPortlet p = new NotesPortlet();
p.setName(this.getName());
p.setConfiguration(configuration);
+ p.setDefaultMaxEntries(getDefaultMaxEntries());
p.setTranslator(translator);
return p;
}
@@ -76,9 +77,9 @@ public class NotesPortlet extends AbstractPortlet {
* @see org.olat.gui.control.generic.portal.Portlet#getInitialRunComponent(org.olat.core.gui.control.WindowControl, org.olat.core.gui.UserRequest)
*/
public Component getInitialRunComponent(WindowControl wControl, UserRequest ureq) {
- if(this.runCtr != null) runCtr.dispose();
- this.runCtr = new NotesPortletRunController(wControl, ureq, getTranslator(), this.getName());
- return this.runCtr.getInitialComponent();
+ if(runCtr != null) runCtr.dispose();
+ runCtr = new NotesPortletRunController(wControl, ureq, getTranslator(), getName(), getDefaultMaxEntries());
+ return runCtr.getInitialComponent();
}
/**
@@ -107,7 +108,7 @@ public class NotesPortlet extends AbstractPortlet {
public PortletToolController<Note> getTools(UserRequest ureq, WindowControl wControl) {
if (runCtr == null) {
- this.runCtr = new NotesPortletRunController(wControl, ureq, getTranslator(), this.getName());
+ runCtr = new NotesPortletRunController(wControl, ureq, getTranslator(), getName(), getDefaultMaxEntries());
}
return runCtr.createSortingTool(ureq, wControl);
}
diff --git a/src/main/java/org/olat/note/NotesPortletRunController.java b/src/main/java/org/olat/note/NotesPortletRunController.java
index fa5bfd4b5d6e41adca6e4b0ea3b929be1592bdab..f02fd60f73ff90e75d16b9fd5f0ffd3e7a954fce 100644
--- a/src/main/java/org/olat/note/NotesPortletRunController.java
+++ b/src/main/java/org/olat/note/NotesPortletRunController.java
@@ -90,8 +90,9 @@ public class NotesPortletRunController extends AbstractPortletRunController<Note
* @param ureq
* @param component
*/
- public NotesPortletRunController(WindowControl wControl, UserRequest ureq, Translator trans, String portletName) {
- super(wControl, ureq, trans, portletName);
+ public NotesPortletRunController(WindowControl wControl, UserRequest ureq, Translator trans,
+ String portletName, int defaultMaxEntries) {
+ super(wControl, ureq, trans, portletName, defaultMaxEntries);
this.cOwner = ureq.getIdentity();
sortingTermsList.add(SortingCriteria.ALPHABETICAL_SORTING);
diff --git a/src/main/java/org/olat/notifications/NotificationsPortlet.java b/src/main/java/org/olat/notifications/NotificationsPortlet.java
index ef687a4ec4f2f259f9476585e680ba586fca6356..dca367f9c94ebac3b76354499b37d717157ea0d5 100644
--- a/src/main/java/org/olat/notifications/NotificationsPortlet.java
+++ b/src/main/java/org/olat/notifications/NotificationsPortlet.java
@@ -52,9 +52,10 @@ public class NotificationsPortlet extends AbstractPortlet {
*/
public Portlet createInstance(WindowControl wControl, UserRequest ureq, Map<String,String> configuration) {
Translator translator = Util.createPackageTranslator(NotificationsPortlet.class, ureq.getLocale());
- Portlet p = new NotificationsPortlet();
+ NotificationsPortlet p = new NotificationsPortlet();
p.setName(this.getName());
p.setConfiguration(configuration);
+ p.setDefaultMaxEntries(getDefaultMaxEntries());
p.setTranslator(translator);
return p;
}
@@ -78,7 +79,7 @@ public class NotificationsPortlet extends AbstractPortlet {
*/
public Component getInitialRunComponent(WindowControl wControl, UserRequest ureq) {
if(this.runCtr != null) runCtr.dispose();
- this.runCtr = new NotificationsPortletRunController(wControl, ureq, getTranslator(), this.getName());
+ this.runCtr = new NotificationsPortletRunController(wControl, ureq, getTranslator(), getName(), getDefaultMaxEntries());
return this.runCtr.getInitialComponent();
}
@@ -108,9 +109,8 @@ public class NotificationsPortlet extends AbstractPortlet {
public PortletToolController<Subscriber> getTools(UserRequest ureq, WindowControl wControl) {
if (runCtr == null) {
- this.runCtr = new NotificationsPortletRunController(wControl, ureq, getTranslator(), this.getName());
+ this.runCtr = new NotificationsPortletRunController(wControl, ureq, getTranslator(), getName(), getDefaultMaxEntries());
}
return runCtr.createSortingTool(ureq, wControl);
}
-
}
diff --git a/src/main/java/org/olat/notifications/NotificationsPortletRunController.java b/src/main/java/org/olat/notifications/NotificationsPortletRunController.java
index 62829f0b33e2ce0659f5f40ec91f8b879dfbef2b..f263b23368cbc94446cc1bf12925dc3f193cc853 100644
--- a/src/main/java/org/olat/notifications/NotificationsPortletRunController.java
+++ b/src/main/java/org/olat/notifications/NotificationsPortletRunController.java
@@ -96,8 +96,9 @@ public class NotificationsPortletRunController extends AbstractPortletRunControl
* @param ureq
* @param component
*/
- public NotificationsPortletRunController(WindowControl wControl, UserRequest ureq, Translator trans, String portletName) {
- super(wControl, ureq, trans, portletName);
+ public NotificationsPortletRunController(WindowControl wControl, UserRequest ureq, Translator trans,
+ String portletName, int defaultMaxEntries) {
+ super(wControl, ureq, trans, portletName, defaultMaxEntries);
sortingTermsList.add(SortingCriteria.TYPE_SORTING);
sortingTermsList.add(SortingCriteria.ALPHABETICAL_SORTING);
diff --git a/src/main/java/org/olat/repository/portlet/RepositoryPortlet.java b/src/main/java/org/olat/repository/portlet/RepositoryPortlet.java
index ca1629945152866489310186f86d9017428582a4..8dd69af41565a7d40878e586cf4087ebe2ffaae8 100644
--- a/src/main/java/org/olat/repository/portlet/RepositoryPortlet.java
+++ b/src/main/java/org/olat/repository/portlet/RepositoryPortlet.java
@@ -52,18 +52,21 @@ public class RepositoryPortlet extends AbstractPortlet {
* @see org.olat.gui.control.generic.portal.AbstractPortlet#createInstance(org.olat.core.gui.control.WindowControl,
* org.olat.core.gui.UserRequest, java.util.Map)
*/
+ @Override
public Portlet createInstance(WindowControl wControl, UserRequest ureq, Map<String,String> configuration) {
Translator translator = Util.createPackageTranslator(RepositoryPortlet.class, ureq.getLocale());
- Portlet p = new RepositoryPortlet();
- p.setName(this.getName());
+ RepositoryPortlet p = new RepositoryPortlet();
+ p.setName(getName());
p.setConfiguration(configuration);
p.setTranslator(translator);
+ p.setDefaultMaxEntries(getDefaultMaxEntries());
return p;
}
/**
* @see org.olat.gui.control.generic.portal.Portlet#getTitle()
*/
+ @Override
public String getTitle() {
if (CONFIG_KEY_ROLE_STUDENT.equals(getConfiguration().get(CONFIG_KEY_ROLE))) {
return getTranslator().translate("repositoryPortlet.student.title");
@@ -75,6 +78,7 @@ public class RepositoryPortlet extends AbstractPortlet {
/**
* @see org.olat.gui.control.generic.portal.Portlet#getDescription()
*/
+ @Override
public String getDescription() {
if (CONFIG_KEY_ROLE_STUDENT.equals(getConfiguration().get(CONFIG_KEY_ROLE))) {
return getTranslator().translate("repositoryPortlet.student.description");
@@ -87,16 +91,19 @@ public class RepositoryPortlet extends AbstractPortlet {
* @see org.olat.gui.control.generic.portal.Portlet#getInitialRunComponent(org.olat.core.gui.control.WindowControl,
* org.olat.core.gui.UserRequest)
*/
+ @Override
public Component getInitialRunComponent(WindowControl wControl, UserRequest ureq) {
- if(this.runCtr != null) runCtr.dispose();
+ if(runCtr != null) runCtr.dispose();
+ int maxEntries = getDefaultMaxEntries();
boolean studentView = CONFIG_KEY_ROLE_STUDENT.equals(getConfiguration().get(CONFIG_KEY_ROLE));
- this.runCtr = new RepositoryPortletRunController(wControl, ureq, getTranslator(), this.getName(), studentView);
- return this.runCtr.getInitialComponent();
+ runCtr = new RepositoryPortletRunController(wControl, ureq, getTranslator(), getName(), maxEntries, studentView);
+ return runCtr.getInitialComponent();
}
/**
* @see org.olat.core.gui.control.Disposable#dispose(boolean)
*/
+ @Override
public void dispose() {
disposeRunComponent();
}
@@ -104,6 +111,7 @@ public class RepositoryPortlet extends AbstractPortlet {
/**
* @see org.olat.gui.control.generic.portal.Portlet#getCssClass()
*/
+ @Override
public String getCssClass() {
if (CONFIG_KEY_ROLE_STUDENT.equals(getConfiguration().get(CONFIG_KEY_ROLE))) {
return "o_portlet_repository_student";
@@ -115,6 +123,7 @@ public class RepositoryPortlet extends AbstractPortlet {
/**
* @see org.olat.gui.control.generic.portal.Portlet#disposeRunComponent(boolean)
*/
+ @Override
public void disposeRunComponent() {
if (this.runCtr != null) {
this.runCtr.dispose();
@@ -122,11 +131,12 @@ public class RepositoryPortlet extends AbstractPortlet {
}
}
+ @Override
public PortletToolController<RepositoryEntryLight> getTools(UserRequest ureq, WindowControl wControl) {
//portlet was not yet visible
if ( runCtr == null ) {
boolean studentView = CONFIG_KEY_ROLE_STUDENT.equals(getConfiguration().get(CONFIG_KEY_ROLE));
- this.runCtr = new RepositoryPortletRunController(wControl, ureq, getTranslator(), this.getName(), studentView);
+ runCtr = new RepositoryPortletRunController(wControl, ureq, getTranslator(), getName(), getDefaultMaxEntries(), studentView);
}
return runCtr.createSortingTool(ureq, wControl);
}
diff --git a/src/main/java/org/olat/repository/portlet/RepositoryPortletRunController.java b/src/main/java/org/olat/repository/portlet/RepositoryPortletRunController.java
index b78cdd1190b56a7c75630c33643c71d03056eb9d..521a7c9a2ba6b006fc7ee9c6099eb8ec70f52545 100644
--- a/src/main/java/org/olat/repository/portlet/RepositoryPortletRunController.java
+++ b/src/main/java/org/olat/repository/portlet/RepositoryPortletRunController.java
@@ -80,8 +80,9 @@ public class RepositoryPortletRunController extends AbstractPortletRunController
* @param portletName
* @param studentView true: show courses where I'm student; false: show courses where I'm teacher
*/
- public RepositoryPortletRunController(WindowControl wControl, UserRequest ureq, Translator trans, String portletName, boolean studentView) {
- super(wControl, ureq, trans, portletName);
+ public RepositoryPortletRunController(WindowControl wControl, UserRequest ureq, Translator trans, String portletName,
+ int defaultMaxEntries, boolean studentView) {
+ super(wControl, ureq, trans, portletName, defaultMaxEntries);
this.studentView = studentView;
sortingTermsList.add(SortingCriteria.ALPHABETICAL_SORTING);
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index 1988591954674e8a142bc2b8e0dc154cb53f00ea..b15e29d9226afb372ed857096852b4b6a0e15c80 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -292,7 +292,7 @@ onyx.update.results.job=disabled
onyx.plugin.exammodelocation=${onyx.plugin.wslocation}/onyxexamservices
### set or overwrite this switch to "true" if this olat-node is either a single-node or should be the controlling entity in a clustered-olat
-exam.mode.masternode=false
+exam.mode.masternode=true
#####
@@ -343,7 +343,9 @@ portlet.efficiencyStatements.enabled=true
portlet.quickstart.enabled=true
portlet.calendar.enabled=true
portlet.repository.student.enabled=true
+portlet.repository.student.entries=6
portlet.repository.teacher.enabled=true
+portlet.repository.teacher.entries=6
# the info message portlet is a counterpart of the course building block
# course.node.infomessage, see further down this file.
portlet.infomessages.enabled=true