Repository: hbase Updated Branches: refs/heads/branch-2 46c780839 -> d951675df
HBASE-20398 Redirect doesn't work on web UI Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d951675d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d951675d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d951675d Branch: refs/heads/branch-2 Commit: d951675df53e266dbbf717a1f1994acdaed063d6 Parents: 46c7808 Author: Balazs Meszaros <balazs.mesza...@cloudera.com> Authored: Tue Apr 17 14:58:08 2018 +0200 Committer: Michael Stack <st...@apache.org> Committed: Tue Apr 17 09:19:13 2018 -0700 ---------------------------------------------------------------------- .../resources/hbase-webapps/master/redirect.jsp | 27 ++++++++++++++++++++ .../resources/hbase-webapps/master/rsgroup.jsp | 4 +-- .../resources/hbase-webapps/master/snapshot.jsp | 2 +- .../resources/hbase-webapps/master/table.jsp | 4 +-- 4 files changed, 32 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/d951675d/hbase-server/src/main/resources/hbase-webapps/master/redirect.jsp ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/redirect.jsp b/hbase-server/src/main/resources/hbase-webapps/master/redirect.jsp new file mode 100644 index 0000000..f9e3ae6 --- /dev/null +++ b/hbase-server/src/main/resources/hbase-webapps/master/redirect.jsp @@ -0,0 +1,27 @@ +<%-- +/** +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ +--%> +<div> + Go <a href="javascript:history.back()">Back</a>, or wait for the redirect. +</div> +<script type="text/javascript"> +<!-- + setTimeout("history.back()", 5000); +--> +</script> http://git-wip-us.apache.org/repos/asf/hbase/blob/d951675d/hbase-server/src/main/resources/hbase-webapps/master/rsgroup.jsp ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/rsgroup.jsp b/hbase-server/src/main/resources/hbase-webapps/master/rsgroup.jsp index 7a80c35..0b2b581 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/rsgroup.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/rsgroup.jsp @@ -63,7 +63,7 @@ <h1>RSGroups are not enabled</h1> </div> </div> - <p>Go <a href="javascript:history.back()">Back</a>, or wait for the redirect. + <jsp:include page="redirect.jsp" /> <% } else if (rsGroupName == null || rsGroupName.isEmpty() || (rsGroupInfo = RSGroupTableAccessor.getRSGroupInfo( @@ -74,7 +74,7 @@ <h1>RSGroup: <%= rsGroupName %> does not exist</h1> </div> </div> - <p>Go <a href="javascript:history.back()">Back</a>, or wait for the redirect. + <jsp:include page="redirect.jsp" /> <% } else { List<Address> rsGroupServers = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/hbase/blob/d951675d/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp b/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp index b0cfe87..6e1c9eb 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/snapshot.jsp @@ -72,7 +72,7 @@ <h1>Snapshot "<%= snapshotName %>" does not exist</h1> </div> </div> - <p>Go <a href="javascript:history.back()">Back</a>, or wait for the redirect. + <jsp:include page="redirect.jsp" /> <% } else { %> <div class="row"> <div class="page-header"> http://git-wip-us.apache.org/repos/asf/hbase/blob/d951675d/hbase-server/src/main/resources/hbase-webapps/master/table.jsp ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp index cf735ec..d7844df 100644 --- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp @@ -182,7 +182,7 @@ if ( fqtn != null ) { } } %> -<p>Go <a href="javascript:history.back()">Back</a>, or wait for the redirect. +<jsp:include page="redirect.jsp" /> </div> <% } else { @@ -793,7 +793,7 @@ Actions: </div> </div> <p><hr><p> -<p>Go <a href="javascript:history.back()">Back</a>, or wait for the redirect. +<jsp:include page="redirect.jsp" /> </div> <% } %>
