Disable OnlyOffice buttons when the converter is disabled

logicaldoc · Oct 3, 2024 · 581f030 · 581f030
1 parent f84cbfc
commit 581f030
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...caldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/DocumentToolbar.java b/...caldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/DocumentToolbar.java
@@ -483,12 +483,12 @@ private void addOffice() {
 	}
 
 	private void addOnlyOffice() {
-		if (Feature.visible(Feature.ONLYOFFICE) && Menu.enabled(Menu.ONLYOFFICE)) {
+		if (Feature.visible(Feature.ONLYOFFICE) && Menu.enabled(Menu.ONLYOFFICE) && Session.get().getConfigAsBoolean("converter.OnlyOfficeConverter.enabled")) {
 			addButton(onlyoffice);
 			onlyoffice.setTooltip(I18N.message("editwithonlyoffice"));
 			onlyoffice.setTitle("<i class='fal fa-briefcase fa-lg fa-lg' aria-hidden='true'></i>");
 			if (!Feature.enabled(Feature.OFFICE))
-				setFeatureDisabled(office);
+				setFeatureDisabled(onlyoffice);
 
 			onlyoffice.addClickHandler(click -> checkPermissionsAndRun(
 					new String[] { GUIAccessControlEntry.PERMISSION_DOWNLOAD, GUIAccessControlEntry.PERMISSION_WRITE },

diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/menu/MainMenu.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/menu/MainMenu.java
@@ -641,7 +641,8 @@ private void addItemsWhenFolderOrDocumentSelected(GUIFolder folder, GUIDocument
 				&& com.logicaldoc.gui.common.client.Menu.enabled(com.logicaldoc.gui.common.client.Menu.GOOGLEDRIVE))
 			menu.addItem(new DriveMenuItem(folder, document));
 		if (Feature.enabled(Feature.ONLYOFFICE)
-				&& com.logicaldoc.gui.common.client.Menu.enabled(com.logicaldoc.gui.common.client.Menu.ONLYOFFICE))
+				&& com.logicaldoc.gui.common.client.Menu.enabled(com.logicaldoc.gui.common.client.Menu.ONLYOFFICE)
+				&& Session.get().getConfigAsBoolean("converter.OnlyOfficeConverter.enabled"))
 			menu.addItem(getOnlyOfficeMenuItem(folder, document));
 		if (Feature.enabled(Feature.ZOHO)
 				&& com.logicaldoc.gui.common.client.Menu.enabled(com.logicaldoc.gui.common.client.Menu.ZOHO))