Skip to content

Commit 581f030

Browse files
committed
Disable OnlyOffice buttons when the converter is disabled
1 parent f84cbfc commit 581f030

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/DocumentToolbar.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -483,12 +483,12 @@ private void addOffice() {
483483
}
484484

485485
private void addOnlyOffice() {
486-
if (Feature.visible(Feature.ONLYOFFICE) && Menu.enabled(Menu.ONLYOFFICE)) {
486+
if (Feature.visible(Feature.ONLYOFFICE) && Menu.enabled(Menu.ONLYOFFICE) && Session.get().getConfigAsBoolean("converter.OnlyOfficeConverter.enabled")) {
487487
addButton(onlyoffice);
488488
onlyoffice.setTooltip(I18N.message("editwithonlyoffice"));
489489
onlyoffice.setTitle("<i class='fal fa-briefcase fa-lg fa-lg' aria-hidden='true'></i>");
490490
if (!Feature.enabled(Feature.OFFICE))
491-
setFeatureDisabled(office);
491+
setFeatureDisabled(onlyoffice);
492492

493493
onlyoffice.addClickHandler(click -> checkPermissionsAndRun(
494494
new String[] { GUIAccessControlEntry.PERMISSION_DOWNLOAD, GUIAccessControlEntry.PERMISSION_WRITE },

logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/menu/MainMenu.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,8 @@ private void addItemsWhenFolderOrDocumentSelected(GUIFolder folder, GUIDocument
641641
&& com.logicaldoc.gui.common.client.Menu.enabled(com.logicaldoc.gui.common.client.Menu.GOOGLEDRIVE))
642642
menu.addItem(new DriveMenuItem(folder, document));
643643
if (Feature.enabled(Feature.ONLYOFFICE)
644-
&& com.logicaldoc.gui.common.client.Menu.enabled(com.logicaldoc.gui.common.client.Menu.ONLYOFFICE))
644+
&& com.logicaldoc.gui.common.client.Menu.enabled(com.logicaldoc.gui.common.client.Menu.ONLYOFFICE)
645+
&& Session.get().getConfigAsBoolean("converter.OnlyOfficeConverter.enabled"))
645646
menu.addItem(getOnlyOfficeMenuItem(folder, document));
646647
if (Feature.enabled(Feature.ZOHO)
647648
&& com.logicaldoc.gui.common.client.Menu.enabled(com.logicaldoc.gui.common.client.Menu.ZOHO))

0 commit comments

Comments
 (0)