Skip to content
Snippets Groups Projects
Commit dd42f58e authored by srosse's avatar srosse
Browse files

OO-1115: set the quota information at the end of the wizard

parent c5838a4d
No related branches found
No related tags found
No related merge requests found
......@@ -73,6 +73,8 @@ import org.olat.core.util.mail.MailHelper;
import org.olat.core.util.mail.MailPackage;
import org.olat.core.util.mail.MailTemplate;
import org.olat.core.util.resource.OresHelper;
import org.olat.core.util.vfs.Quota;
import org.olat.core.util.vfs.QuotaManager;
import org.olat.group.BusinessGroup;
import org.olat.group.BusinessGroupManagedFlag;
import org.olat.group.BusinessGroupMembership;
......@@ -599,6 +601,16 @@ public abstract class AbstractBusinessGroupListController extends BasicControlle
tools.setToolEnabled(enabledTool, true);
if(CollaborationTools.TOOL_FOLDER.equals(enabledTool)) {
tools.saveFolderAccess(new Long(configuration.getFolderAccess()));
Quota quota = configuration.getQuota();
if(quota != null) {
String path = tools.getFolderRelPath();
Quota fQuota = QuotaManager.getInstance()
.createQuota(path, quota.getQuotaKB(), quota.getUlLimitKB());
QuotaManager.getInstance()
.setCustomQuotaKB(fQuota);
}
} else if (CollaborationTools.TOOL_CALENDAR.equals(enabledTool)) {
tools.saveCalendarAccess(new Long(configuration.getCalendarAccess()));
}
......
......@@ -30,6 +30,7 @@ import org.olat.core.commons.modules.bc.FolderConfig;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.form.flexible.FormItemContainer;
import org.olat.core.gui.components.form.flexible.elements.IntegerElement;
import org.olat.core.gui.components.form.flexible.impl.Form;
import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.Event;
......@@ -59,6 +60,13 @@ public class BGConfigQuotaController extends FormBasicController {
this.quota = quota;
initForm(ureq);
}
public BGConfigQuotaController(UserRequest ureq, WindowControl wControl, Quota quota, Form rootForm) {
super(ureq, wControl, -1, null, rootForm);
setTranslator(Util.createPackageTranslator(QuotaForm.class, getLocale(), getTranslator()));
this.quota = quota;
initForm(ureq);
}
/**
* @return Quota in KB.
......
......@@ -116,7 +116,7 @@ public class BGConfigToolsStepController extends StepFormBasicController {
//add quota configuration for admin only
if(ureq.getUserSession().getRoles().isOLATAdmin()) {
Quota quota = quotaManager.createQuota(null, null, null);
config.quotaCtrl = new BGConfigQuotaController(ureq, getWindowControl(), quota);
config.quotaCtrl = new BGConfigQuotaController(ureq, getWindowControl(), quota, mainForm);
config.configContainer.add("quota", config.quotaCtrl.getInitialFormItem());
config.quotaCtrl.getInitialFormItem().setVisible(false);
}
......@@ -168,7 +168,9 @@ public class BGConfigToolsStepController extends StepFormBasicController {
configuration.setFolderAccess(config.folderCtrl.getFolderAccess());
//only admin are allowed to configure quota
if(ureq.getUserSession().getRoles().isOLATAdmin() && config.quotaCtrl != null) {
Quota quota = quotaManager.createQuota(null, config.quotaCtrl.getQuotaKB(), config.quotaCtrl.getULLimit());
Long quotaKB = config.quotaCtrl.getQuotaKB();
Long ulLimit = config.quotaCtrl.getULLimit();
Quota quota = quotaManager.createQuota(null, quotaKB, ulLimit);
configuration.setQuota(quota);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment