From d305562fe3ca9e1f040274c9fdb22e712b2fc6e5 Mon Sep 17 00:00:00 2001 From: Balazs Meszaros Date: Tue, 17 Apr 2018 14:58:08 +0200 Subject: [PATCH] HBASE-20398 Redirect doesn't work on web UI --- .../hbase-webapps/master/redirect.jsp | 27 +++++++++++++++++++ .../hbase-webapps/master/rsgroup.jsp | 4 +-- .../hbase-webapps/master/snapshot.jsp | 2 +- .../resources/hbase-webapps/master/table.jsp | 4 +-- 4 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 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 0000000000..f9e3ae66ec --- /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. +*/ +--%> +
+ Go Back, or wait for the redirect. +
+ 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 7a80c35efc..0b2b581e48 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 @@

RSGroups are not enabled

-

Go Back, or wait for the redirect. + <% } else if (rsGroupName == null || rsGroupName.isEmpty() || (rsGroupInfo = RSGroupTableAccessor.getRSGroupInfo( @@ -74,7 +74,7 @@

RSGroup: <%= rsGroupName %> does not exist

-

Go Back, or wait for the redirect. + <% } else { List

rsGroupServers = new ArrayList<>(); 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 b0cfe8737a..6e1c9eb4cf 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 @@

Snapshot "<%= snapshotName %>" does not exist

-

Go Back, or wait for the redirect. + <% } else { %>

<% } else { @@ -800,7 +800,7 @@ Actions:


-

Go Back, or wait for the redirect. + <% } %> -- 2.17.0