From d1ef31a86fa56fd6b50ebc25ba3ae31cda8f4d65 Mon Sep 17 00:00:00 2001 From: car031 Date: Mon, 6 May 2024 16:17:09 +0200 Subject: [PATCH] removed unused open in folder menu item --- .../client/document/grid/ContextMenu.java | 189 +++++++++--------- .../frontend/client/search/HitsListPanel.java | 9 - 2 files changed, 97 insertions(+), 101 deletions(-) diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/grid/ContextMenu.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/grid/ContextMenu.java index d69cf2e35..27de30c00 100644 --- a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/grid/ContextMenu.java +++ b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/document/grid/ContextMenu.java @@ -154,147 +154,152 @@ public void onFailure(Throwable caught) { @Override public void onSuccess(GUIAccessControlEntry enabledPermissions) { - download = new MenuItem(); - download.setTitle(I18N.message("download")); - download.addClickHandler(event -> onDownload(folder, selection)); + fillContextMenu(folder, selection, enabledPermissions); + } + }); + } - cut = prepareCutItem(selection); + protected void fillContextMenu(GUIFolder folder, final List selection, + GUIAccessControlEntry enabledPermissions) { + download = new MenuItem(); + download.setTitle(I18N.message("download")); + download.addClickHandler(event -> onDownload(folder, selection)); - copy = prepareCopyItem(selection); + cut = prepareCutItem(selection); - rename = prepareRenameItem(selection); + copy = prepareCopyItem(selection); - openInFolder = prepareOpenInFolderItem(selection); + rename = prepareRenameItem(selection); - delete = prepareDeleteItem(selection); + openInFolder = prepareOpenInFolderItem(selection); - sendMail = new MenuItem(); - sendMail.setTitle(I18N.message("sendmail")); - sendMail.addClickHandler( - event -> new EmailDialog(grid.getSelectedIds(), selection.get(0).getFileName()).show()); + delete = prepareDeleteItem(selection); - links = prepareLinksItem(selection); + sendMail = new MenuItem(); + sendMail.setTitle(I18N.message("sendmail")); + sendMail.addClickHandler( + event -> new EmailDialog(grid.getSelectedIds(), selection.get(0).getFileName()).show()); - immutable = prepareImmutableItem(selection); + links = prepareLinksItem(selection); - setPassword = prepareSetPasswordItem(selection); + immutable = prepareImmutableItem(selection); - unsetPassword = prepareUnsetPasswordItem(selection); + setPassword = prepareSetPasswordItem(selection); - lock = prepareLockItem(selection); + unsetPassword = prepareUnsetPasswordItem(selection); - unlock = prepareUnlockItem(selection); + lock = prepareLockItem(selection); - checkout = prepareCheckoutItem(folder, selection); + unlock = prepareUnlockItem(selection); - checkin = prepareCheckinItem(selection); + checkout = prepareCheckoutItem(folder, selection); - archive = prepareArchiveItem(selection); + checkin = prepareCheckinItem(selection); - bookmark = prepareBookmarkItem(selection); + archive = prepareArchiveItem(selection); - markUnindexable = prepareMarkUnindexableItem(selection); + bookmark = prepareBookmarkItem(selection); - markIndexable = prepareMarkIndexableItem(selection); + markUnindexable = prepareMarkUnindexableItem(selection); - markIndexableMetadataOnly = markIndexableMetadataOnlyItem(selection); + markIndexable = prepareMarkIndexableItem(selection); - index = prepareIndexItem(selection); + markIndexableMetadataOnly = markIndexableMetadataOnlyItem(selection); - sign = new MenuItem(); - sign.setTitle(I18N.message("sign")); - sign.addClickHandler(event -> new DigitalSignatureDialog(getSelectionIds(selection)).show()); + index = prepareIndexItem(selection); - stamp = new MenuItem(); - stamp.setTitle(I18N.message("stamp")); - stamp.addClickHandler(event -> new StampDialog(selection).show()); + sign = new MenuItem(); + sign.setTitle(I18N.message("sign")); + sign.addClickHandler(event -> new DigitalSignatureDialog(getSelectionIds(selection)).show()); - office = new MenuItem(I18N.message("editwithoffice")); - office.addClickHandler(event -> Util.openEditWithOffice(selection.get(0).getId())); + stamp = new MenuItem(); + stamp.setTitle(I18N.message("stamp")); + stamp.addClickHandler(event -> new StampDialog(selection).show()); - sendToExpArchive = new MenuItem(I18N.message("sendtoexparchive")); - sendToExpArchive - .addClickHandler(event -> new SendToArchiveDialog(getSelectionIds(selection), true).show()); + office = new MenuItem(I18N.message("editwithoffice")); + office.addClickHandler(event -> Util.openEditWithOffice(selection.get(0).getId())); - workflow = new MenuItem(I18N.message("startworkflow")); - workflow.addClickHandler(event -> new StartWorkflowDialog(getSelectionIds(selection)).show()); + sendToExpArchive = new MenuItem(I18N.message("sendtoexparchive")); + sendToExpArchive + .addClickHandler(event -> new SendToArchiveDialog(getSelectionIds(selection), true).show()); - automation = new MenuItem(I18N.message("executeautomation")); - automation.addClickHandler( - event -> new AutomationDialog(folder.getId(), getSelectionIds(selection)).show()); + workflow = new MenuItem(I18N.message("startworkflow")); + workflow.addClickHandler(event -> new StartWorkflowDialog(getSelectionIds(selection)).show()); - preview = preparePreview(); + automation = new MenuItem(I18N.message("executeautomation")); + automation.addClickHandler( + event -> new AutomationDialog(folder.getId(), getSelectionIds(selection)).show()); - ticket = new MenuItem(I18N.message("ticket")); - ticket.addClickHandler(event -> new TicketDialog(selection.get(0)).show()); + preview = preparePreview(); - convert = new MenuItem(I18N.message("convert")); - convert.addClickHandler(event -> new ConversionDialog(selection.get(0)).show()); + ticket = new MenuItem(I18N.message("ticket")); + ticket.addClickHandler(event -> new TicketDialog(selection.get(0)).show()); - compare = prepareCompareItem(selection); + convert = new MenuItem(I18N.message("convert")); + convert.addClickHandler(event -> new ConversionDialog(selection.get(0)).show()); - replaceAlias = prepareReplaceAlias(); + compare = prepareCompareItem(selection); - split = new MenuItem(I18N.message("split")); - split.addClickHandler(event -> new SplitDialog(selection.get(0)).show()); + replaceAlias = prepareReplaceAlias(); - merge = prepareMergeItem(folder, getSelectionIds(selection)); + split = new MenuItem(I18N.message("split")); + split.addClickHandler(event -> new SplitDialog(selection.get(0)).show()); - customActionsItem = prepareCustomActionsItem(folder.getId(), getSelectionIds(selection)); + merge = prepareMergeItem(folder, getSelectionIds(selection)); - readingRequest = new MenuItem(); - readingRequest.setTitle(I18N.message("requestreading")); - readingRequest.addClickHandler(event -> new ReadingRequestDialog(grid.getSelectedIds()).show()); + customActionsItem = prepareCustomActionsItem(folder.getId(), getSelectionIds(selection)); - setItems(download, preview, openInFolder, cut, copy, rename, delete, bookmark, sendMail, links, office, - checkout, checkin, lock, unlock); + readingRequest = new MenuItem(); + readingRequest.setTitle(I18N.message("requestreading")); + readingRequest.addClickHandler(event -> new ReadingRequestDialog(grid.getSelectedIds()).show()); - more = new MenuItem(I18N.message("more")); - addItem(more); + setItems(download, preview, openInFolder, cut, copy, rename, delete, bookmark, sendMail, links, office, + checkout, checkin, lock, unlock); - indexingMenu = new Menu(); - indexingMenu.setItems(index, markIndexable, markIndexableMetadataOnly, markUnindexable); + more = new MenuItem(I18N.message("more")); + addItem(more); - indexing = new MenuItem(I18N.message("indexing")); - indexing.setSubmenu(indexingMenu); + indexingMenu = new Menu(); + indexingMenu.setItems(index, markIndexable, markIndexableMetadataOnly, markUnindexable); - moreMenu = new Menu(); - moreMenu.setItems(indexing, immutable, setPassword, unsetPassword, ticket, replaceAlias); + indexing = new MenuItem(I18N.message("indexing")); + indexing.setSubmenu(indexingMenu); - removeOfficeItem(office); + moreMenu = new Menu(); + moreMenu.setItems(indexing, immutable, setPassword, unsetPassword, ticket, replaceAlias); - addArchiveItem(archive); - addCustomActionsItem(customActionsItem); + removeOfficeItem(office); - addConversionItem(convert, moreMenu); - addCompareItem(compare, moreMenu); - addSignItem(sign, moreMenu); - addStampItem(stamp, moreMenu); - addSplitItem(split, moreMenu); - addReadingRequestItem(readingRequest, moreMenu); + addArchiveItem(archive); + addCustomActionsItem(customActionsItem); - moreMenu.addItem(merge); + addConversionItem(convert, moreMenu); + addCompareItem(compare, moreMenu); + addSignItem(sign, moreMenu); + addStampItem(stamp, moreMenu); + addSplitItem(split, moreMenu); + addReadingRequestItem(readingRequest, moreMenu); - addSendToArchiveItem(sendToExpArchive, moreMenu); - addWorkflowItem(workflow, moreMenu); - addAutomationItem(automation, moreMenu); + moreMenu.addItem(merge); - more.setSubmenu(moreMenu); + addSendToArchiveItem(sendToExpArchive, moreMenu); + addWorkflowItem(workflow, moreMenu); + addAutomationItem(automation, moreMenu); - /** - * Now implement the security policies - */ - boolean someSelection = !selection.isEmpty(); - boolean moreSelected = selection.size() > 1; - boolean justOneSelected = someSelection && selection.size() == 1; - boolean immutablesInSelection = someSelection && checkImmutablesInSelection(selection); + more.setSubmenu(moreMenu); - applySecurityPolicies(enabledPermissions, selection, someSelection, moreSelected, justOneSelected, - immutablesInSelection); - } - }); - } + /** + * Now implement the security policies + */ + boolean someSelection = !selection.isEmpty(); + boolean moreSelected = selection.size() > 1; + boolean justOneSelected = someSelection && selection.size() == 1; + boolean immutablesInSelection = someSelection && checkImmutablesInSelection(selection); + applySecurityPolicies(enabledPermissions, selection, someSelection, moreSelected, justOneSelected, + immutablesInSelection); + } + private void applySecurityPolicies(GUIAccessControlEntry allowedPermissions, final List selection, boolean someSelection, boolean moreSelected, boolean justOneSelected, boolean immutablesInSelection) { preview.setEnabled(someSelection diff --git a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/search/HitsListPanel.java b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/search/HitsListPanel.java index 15104da67..a8101664d 100644 --- a/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/search/HitsListPanel.java +++ b/logicaldoc-gui/src/main/java/com/logicaldoc/gui/frontend/client/search/HitsListPanel.java @@ -216,15 +216,6 @@ private void showContextMenu(GUIFolder folder, final boolean document) { if (document) { contextMenu = new ContextMenu(folder, grid); - if (com.logicaldoc.gui.common.client.Menu.enabled(com.logicaldoc.gui.common.client.Menu.DOCUMENTS)) { - MenuItem openInFolder = new MenuItem(); - openInFolder.setTitle(I18N.message("openinfolder")); - openInFolder.addClickHandler(event -> { - GUIDocument doc = grid.getSelectedDocument(); - DocumentsPanel.get().openInFolder(doc.getFolder().getId(), doc.getId()); - }); - contextMenu.addItem(openInFolder); - } } else { if (com.logicaldoc.gui.common.client.Menu.enabled(com.logicaldoc.gui.common.client.Menu.DOCUMENTS)) { MenuItem openInFolder = new MenuItem();