Ravi Nori has uploaded a new change for review. Change subject: core : Welcome page should use base reports URL ......................................................................
core : Welcome page should use base reports URL Welcome page should redirect user to base reports url from reports portal link Change-Id: I732df3a7d6ebec5915be21bb945889d8660c615c Bug-Url: https://bugzilla.redhat.com/1116851 Signed-off-by: Ravi Nori <rn...@redhat.com> --- M backend/manager/modules/services/src/main/webapp/WEB-INF/web.xml M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/ReportInit.java 2 files changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/33539/1 diff --git a/backend/manager/modules/services/src/main/webapp/WEB-INF/web.xml b/backend/manager/modules/services/src/main/webapp/WEB-INF/web.xml index 7eaeeb3..eacb753 100644 --- a/backend/manager/modules/services/src/main/webapp/WEB-INF/web.xml +++ b/backend/manager/modules/services/src/main/webapp/WEB-INF/web.xml @@ -60,7 +60,7 @@ <servlet-class>org.ovirt.engine.core.utils.servlet.RedirectServlet</servlet-class> <init-param> <param-name>url</param-name> - <param-value>%{ENGINE_REPORTS_DASHBOARD_URL}</param-value> + <param-value>%{ENGINE_REPORTS_BASE_URL}</param-value> </init-param> </servlet> <servlet-mapping> @@ -69,6 +69,19 @@ </servlet-mapping> <servlet> + <servlet-name>reports-dashboard-redirect</servlet-name> + <servlet-class>org.ovirt.engine.core.utils.servlet.RedirectServlet</servlet-class> + <init-param> + <param-name>url</param-name> + <param-value>%{ENGINE_REPORTS_DASHBOARD_URL}</param-value> + </init-param> + </servlet> + <servlet-mapping> + <servlet-name>reports-dashboard-redirect</servlet-name> + <url-pattern>/reports-dashboard-redirect</url-pattern> + </servlet-mapping> + + <servlet> <servlet-name>reports-rightclick-redirect</servlet-name> <servlet-class>org.ovirt.engine.core.utils.servlet.RedirectServlet</servlet-class> <init-param> diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/ReportInit.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/ReportInit.java index b0a6fa1..8478835 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/ReportInit.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/ReportInit.java @@ -26,7 +26,7 @@ private static final ReportInit INSTANCE = new ReportInit(); private static final int MAX_RETRY_COUNTS = 20; private static final int RETRY_INTERVAL = 30000; - public static final String REDIRECT_SERVICE = "services/reports-redirect"; //$NON-NLS-1$ + public static final String REDIRECT_SERVICE = "services/reports-dashboard-redirect"; //$NON-NLS-1$ public static final String RIGHT_CLICK_REDIRECT_SERVICE = "services/reports-rightclick-redirect"; //$NON-NLS-1$ public static final String STATUS_SERVICE = "services/reports-interface-proxy?command=status"; //$NON-NLS-1$ public static final String XML_SERVICE = "services/reports-interface-proxy?command=webadmin-ui-xml"; //$NON-NLS-1$ -- To view, visit http://gerrit.ovirt.org/33539 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I732df3a7d6ebec5915be21bb945889d8660c615c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Ravi Nori <rn...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
