From 77a0fe7a53619ad4b66b13b6a41586a036701fd6 Mon Sep 17 00:00:00 2001 From: Nathan Dunn Date: Mon, 21 Dec 2015 10:23:29 -0800 Subject: [PATCH 1/2] bumped snapshot --- application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application.properties b/application.properties index 75a96a6a8d..97d49b691d 100644 --- a/application.properties +++ b/application.properties @@ -3,5 +3,5 @@ app.grails.version=2.4.5 app.name=apollo app.servlet.version=3.0 -app.version=2.0.1-RC8-SNAPSHOT +app.version=2.0.2-SNAPSHOT From e665b7db23d4f0e35e9e8ddaea2e164a14d19284 Mon Sep 17 00:00:00 2001 From: Nathan Dunn Date: Mon, 21 Dec 2015 10:50:27 -0800 Subject: [PATCH 2/2] fixed an issue where refseq export panel was unreachable as a non-admin user --- src/gwt/org/bbop/apollo/gwt/client/ExportPanel.java | 6 ++---- src/gwt/org/bbop/apollo/gwt/client/MainPanel.java | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/gwt/org/bbop/apollo/gwt/client/ExportPanel.java b/src/gwt/org/bbop/apollo/gwt/client/ExportPanel.java index d557ca13a3..6b5b23893e 100644 --- a/src/gwt/org/bbop/apollo/gwt/client/ExportPanel.java +++ b/src/gwt/org/bbop/apollo/gwt/client/ExportPanel.java @@ -10,10 +10,7 @@ import org.bbop.apollo.gwt.client.rest.SequenceRestService; import org.bbop.apollo.gwt.shared.FeatureStringEnum; import org.gwtbootstrap3.client.ui.*; -import org.gwtbootstrap3.client.ui.constants.ButtonType; -import org.gwtbootstrap3.client.ui.constants.IconRotate; -import org.gwtbootstrap3.client.ui.constants.IconType; -import org.gwtbootstrap3.client.ui.constants.Toggle; +import org.gwtbootstrap3.client.ui.constants.*; import java.util.List; @@ -47,6 +44,7 @@ public ExportPanel(OrganismInfo organismInfo, String type, Boolean exportAll, Li setTitle("Export"); setClosable(true); setRemoveOnHide(true); + setDataBackdrop(ModalBackdrop.FALSE); Integer count = exportAll ? -1 : sequenceInfoList.size(); String countText = count < 0 ? "all" : count + ""; diff --git a/src/gwt/org/bbop/apollo/gwt/client/MainPanel.java b/src/gwt/org/bbop/apollo/gwt/client/MainPanel.java index 2433a58759..781da96816 100644 --- a/src/gwt/org/bbop/apollo/gwt/client/MainPanel.java +++ b/src/gwt/org/bbop/apollo/gwt/client/MainPanel.java @@ -133,7 +133,6 @@ interface MainPanelUiBinder extends UiBinder { @UiField HTML editUserHeader; - private MultiWordSuggestOracle sequenceOracle = new ReferenceSequenceOracle(); private LoginDialog loginDialog = new LoginDialog(); private RegisterDialog registerDialog = new RegisterDialog(); @@ -149,7 +148,7 @@ public static MainPanel getInstance() { MainPanel() { instance = this; - sequenceSuggestBox = new SuggestBox(sequenceOracle); + sequenceSuggestBox = new SuggestBox(new ReferenceSequenceOracle()); mainSplitPanel = new SplitLayoutPanel() { @Override