diff options
author | Ryan D. Brooks | 2019-04-13 03:06:38 +0000 |
---|---|---|
committer | Ryan D. Brooks | 2020-12-15 21:44:52 +0000 |
commit | 3a7bc52d7a00d9aa90d0a78a02d5b10697de26f2 (patch) | |
tree | af583e261eaadda16826c6d15bf3ae3c0e0947b7 | |
parent | e1f27a60f594f2de7d354edf24374d6692727ccb (diff) | |
download | org.eclipse.osee-3a7bc52d7a00d9aa90d0a78a02d5b10697de26f2.tar.gz org.eclipse.osee-3a7bc52d7a00d9aa90d0a78a02d5b10697de26f2.tar.xz org.eclipse.osee-3a7bc52d7a00d9aa90d0a78a02d5b10697de26f2.zip |
bug: Do not commit workaround for quicksearch
Change-Id: I21363e1b4ecbf8e163486b416feaf1a99da6d228
-rw-r--r-- | plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java index b5fc83096e1..63b338cfd54 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java @@ -28,7 +28,6 @@ import org.eclipse.osee.framework.access.AccessControlManager; import org.eclipse.osee.framework.core.data.ArtifactTypeToken; import org.eclipse.osee.framework.core.data.BranchId; import org.eclipse.osee.framework.core.enums.DeletionFlag; -import org.eclipse.osee.framework.core.enums.PermissionEnum; import org.eclipse.osee.framework.help.ui.OseeHelpContext; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; @@ -39,10 +38,8 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactTypeSearch import org.eclipse.osee.framework.skynet.core.artifact.search.ISearchPrimitive; import org.eclipse.osee.framework.skynet.core.artifact.search.SearchOptions; import org.eclipse.osee.framework.skynet.core.artifact.search.SearchRequest; -import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.skynet.FrameworkImage; import org.eclipse.osee.framework.ui.skynet.OseeStatusContributionItemFactory; -import org.eclipse.osee.framework.ui.skynet.access.AccessControlService; import org.eclipse.osee.framework.ui.skynet.panels.SearchComposite; import org.eclipse.osee.framework.ui.skynet.search.filter.FilterModel; import org.eclipse.osee.framework.ui.skynet.search.filter.FilterModelList; @@ -293,8 +290,8 @@ public class QuickSearchView extends GenericViewPart { final BranchId branch = branchSelect.getData(); if (branch == null) { branchLabel.setText("Error: Must Select a Branch"); - } else if (!AccessControlService.getAccessService().hasPermission(branch, PermissionEnum.READ)) { - AWorkbench.popup(String.format("Access Denied for branch [%s]", branch)); + // } else if (!AccessControlService.getAccessService().hasPermission(branch, PermissionEnum.READ)) { + // AWorkbench.popup(String.format("Access Denied for branch [%s]", branch)); } else if (Widgets.isAccessible(attrSearchComposite) && attrSearchComposite.isExecuteSearchEvent( event) && Widgets.isAccessible(optionsComposite)) { @@ -353,11 +350,11 @@ public class QuickSearchView extends GenericViewPart { final BranchId branch = branchSelect.getData(); if (branch == null) { branchLabel.setText("Error: Must Select a Branch"); - } else if (!AccessControlService.getAccessService().hasPermission(branch, PermissionEnum.READ)) { - // since AttributeSearchListener is called when Select Branch is actioned, only display if this is the guid search button - if (event.widget instanceof Button && ((Button) event.widget).getText().equals("Search")) { - AWorkbench.popup(String.format("Access Denied for branch [%s]", branch)); - } + // } else if (!AccessControlService.getAccessService().hasPermission(branch, PermissionEnum.READ)) { + // // since AttributeSearchListener is called when Select Branch is actioned, only display if this is the guid search button + // if (event.widget instanceof Button && ((Button) event.widget).getText().equals("Search")) { + // AWorkbench.popup(String.format("Access Denied for branch [%s]", branch)); + // } } else if (Widgets.isAccessible(idSearchComposite) && idSearchComposite.isExecuteSearchEvent(event)) { String searchString = idSearchComposite.getQuery(); List<String> invalids = new LinkedList<>(); |