You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drat.apache.org by ma...@apache.org on 2017/11/10 18:03:58 UTC
[drat] branch master updated: - fix for DRAT Workflow Page doesn't
properly return to Home Page when under a ProxyPath this closes #102
This is an automated email from the ASF dual-hosted git repository.
mattmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drat.git
The following commit(s) were added to refs/heads/master by this push:
new 3bd7ba7 - fix for DRAT Workflow Page doesn't properly return to Home Page when under a ProxyPath this closes #102
3bd7ba7 is described below
commit 3bd7ba7bc9e6dfdba5ec74515e1d7bf1735103b9
Author: Chris Mattmann <ch...@jpl.nasa.gov>
AuthorDate: Fri Nov 10 10:03:48 2017 -0800
- fix for DRAT Workflow Page doesn't properly return to Home Page when
under a ProxyPath this closes #102
---
proteus/src/main/java/drat/proteus/DratWorkflow.html | 2 +-
proteus/src/main/java/drat/proteus/DratWorkflow.java | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/proteus/src/main/java/drat/proteus/DratWorkflow.html b/proteus/src/main/java/drat/proteus/DratWorkflow.html
index 13b9172..9ae92dd 100644
--- a/proteus/src/main/java/drat/proteus/DratWorkflow.html
+++ b/proteus/src/main/java/drat/proteus/DratWorkflow.html
@@ -13,7 +13,7 @@
<body ng-controller="switch">
<div class="container" ng-init="runDrat()">
<div class="header">
- <h1 class="proteus"><a style="color:inherit; text-decoration:none" href="/proteus">PROTEUS</a></h1>
+ <h1 class="proteus"><a wicket:id="home_link" id="home_link" href="HomePage.html" style="color:inherit; text-decoration:none">PROTEUS</a></h1>
<span class="h4">'A GUI FOR DRAT'</span>
</div>
diff --git a/proteus/src/main/java/drat/proteus/DratWorkflow.java b/proteus/src/main/java/drat/proteus/DratWorkflow.java
index 4d4ffc0..080847d 100644
--- a/proteus/src/main/java/drat/proteus/DratWorkflow.java
+++ b/proteus/src/main/java/drat/proteus/DratWorkflow.java
@@ -20,6 +20,7 @@ package drat.proteus;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import backend.FileConstants;
@@ -36,6 +37,13 @@ public class DratWorkflow extends WebPage {
super();
this.repoPath = params.get("repoPath")
.toString(FileConstants.DRAT_TEMP_UNZIPPED_PATH);
+
+ add(new Link("home_link") {
+ @Override
+ public void onClick() {
+ setResponsePage(HomePage.class);
+ }
+ });
}
@Override
--
To stop receiving notification emails like this one, please contact
['"commits@drat.apache.org" <co...@drat.apache.org>'].