Skip to content
Snippets Groups Projects
Commit 72d44a74 authored by uhensler's avatar uhensler
Browse files

OO-5273: Release OnlyOffice edit license when window is closed

parent f9745a65
No related branches found
No related tags found
No related merge requests found
...@@ -293,7 +293,7 @@ public class OnlyOfficeServiceImpl implements OnlyOfficeService { ...@@ -293,7 +293,7 @@ public class OnlyOfficeServiceImpl implements OnlyOfficeService {
if (licenseEdit.intValue() <= 0) return false; if (licenseEdit.intValue() <= 0) return false;
Long accessCount = documentEditorServie.getAccessCount(OnlyOfficeEditor.TYPE, Mode.EDIT); Long accessCount = documentEditorServie.getAccessCount(OnlyOfficeEditor.TYPE, Mode.EDIT);
return accessCount < licenseEdit.intValue(); return accessCount <= licenseEdit.intValue();
} }
@Override @Override
......
...@@ -30,6 +30,7 @@ import org.olat.core.commons.services.doceditor.onlyoffice.OnlyOfficeService; ...@@ -30,6 +30,7 @@ import org.olat.core.commons.services.doceditor.onlyoffice.OnlyOfficeService;
import org.olat.core.commons.services.vfs.VFSMetadata; import org.olat.core.commons.services.vfs.VFSMetadata;
import org.olat.core.gui.UserRequest; import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.Component; import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.Window;
import org.olat.core.gui.components.velocity.VelocityContainer; import org.olat.core.gui.components.velocity.VelocityContainer;
import org.olat.core.gui.control.Event; import org.olat.core.gui.control.Event;
import org.olat.core.gui.control.WindowControl; import org.olat.core.gui.control.WindowControl;
...@@ -65,6 +66,8 @@ public class OnlyOfficeEditorController extends BasicController { ...@@ -65,6 +66,8 @@ public class OnlyOfficeEditorController extends BasicController {
final DocEditorConfigs configs, Access runAccess) { final DocEditorConfigs configs, Access runAccess) {
super(ureq, wControl); super(ureq, wControl);
access = runAccess; access = runAccess;
wControl.getWindowBackOffice().getWindow().addListener(this);
if (Mode.EDIT == access.getMode() && !onlyOfficeService.isEditLicenseAvailable()) { if (Mode.EDIT == access.getMode() && !onlyOfficeService.isEditLicenseAvailable()) {
access = docEditorService.updateMode(access, Mode.VIEW); access = docEditorService.updateMode(access, Mode.VIEW);
...@@ -111,11 +114,14 @@ public class OnlyOfficeEditorController extends BasicController { ...@@ -111,11 +114,14 @@ public class OnlyOfficeEditorController extends BasicController {
putInitialPanel(mainVC); putInitialPanel(mainVC);
} }
@Override @Override
protected void event(UserRequest ureq, Component source, Event event) { public void event(UserRequest ureq, Component source, Event event) {
// if(event == Window.CLOSE_WINDOW) {
deleteAccess();
}
} }
@Override @Override
protected void doDispose() { protected void doDispose() {
......
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