From 3862f5c0becbdde897c8eb50516689bad042d552 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Tue, 29 Jan 2019 09:47:25 +0100
Subject: [PATCH] OO-3839: use a default quota in bulk configuration of groups
---
src/main/java/org/olat/admin/quota/QuotaManagerImpl.java | 5 ++++-
.../olat/group/ui/wizard/BGConfigToolsStepController.java | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/admin/quota/QuotaManagerImpl.java b/src/main/java/org/olat/admin/quota/QuotaManagerImpl.java
index 7d0f1757b77..729bf52ac7c 100644
--- a/src/main/java/org/olat/admin/quota/QuotaManagerImpl.java
+++ b/src/main/java/org/olat/admin/quota/QuotaManagerImpl.java
@@ -170,7 +170,10 @@ public class QuotaManagerImpl implements QuotaManager, InitializingBean {
*/
@Override
public Quota getDefaultQuota(String identifyer) {
- return defaultQuotas.get(identifyer);
+ if(StringHelper.containsNonWhitespace(identifyer)) {
+ return defaultQuotas.get(identifyer);
+ }
+ return null;
}
/**
diff --git a/src/main/java/org/olat/group/ui/wizard/BGConfigToolsStepController.java b/src/main/java/org/olat/group/ui/wizard/BGConfigToolsStepController.java
index 9c673c6d1c9..53cddd568bb 100644
--- a/src/main/java/org/olat/group/ui/wizard/BGConfigToolsStepController.java
+++ b/src/main/java/org/olat/group/ui/wizard/BGConfigToolsStepController.java
@@ -22,6 +22,7 @@ package org.olat.group.ui.wizard;
import java.util.ArrayList;
import java.util.List;
+import org.olat.admin.quota.QuotaConstants;
import org.olat.collaboration.CalendarToolSettingsController;
import org.olat.collaboration.CollaborationTools;
import org.olat.collaboration.CollaborationToolsFactory;
@@ -118,7 +119,7 @@ public class BGConfigToolsStepController extends StepFormBasicController {
//add quota configuration for admin only
if(quotaManager.hasMinimalRolesToEditquota(roles)) {
- Quota quota = quotaManager.createQuota(null, null, null);
+ Quota quota = quotaManager.createQuota(QuotaConstants.IDENTIFIER_DEFAULT_GROUPS, null, null);
config.quotaCtrl = new BGConfigQuotaController(ureq, getWindowControl(), quota, mainForm);
config.configContainer.add("quota", config.quotaCtrl.getInitialFormItem());
config.quotaCtrl.getInitialFormItem().setVisible(false);
--
GitLab