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 packaging/branding/ovirt.brand/welcome_page.template
2 files changed, 14 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/93/33493/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..7e3e942 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
@@ -56,6 +56,19 @@
   </servlet-mapping>
 
   <servlet>
+      <servlet-name>reports-base-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_BASE_URL}</param-value>
+      </init-param>
+  </servlet>
+  <servlet-mapping>
+      <servlet-name>reports-base-redirect</servlet-name>
+      <url-pattern>/reports-base-redirect</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
       <servlet-name>reports-redirect</servlet-name>
       
<servlet-class>org.ovirt.engine.core.utils.servlet.RedirectServlet</servlet-class>
       <init-param>
diff --git a/packaging/branding/ovirt.brand/welcome_page.template 
b/packaging/branding/ovirt.brand/welcome_page.template
index b1bd128..3cb0e71 100644
--- a/packaging/branding/ovirt.brand/welcome_page.template
+++ b/packaging/branding/ovirt.brand/welcome_page.template
@@ -2,7 +2,7 @@
     <div class="welcome-section-title">{portal_title}</div>
     <div class="welcome-link"><a id="WelcomePage_userportal" 
href="userportal/?locale={userLocale}">{portal_user_portal}</a></div>
     <div class="welcome-link"><a id="WelcomePage_webadmin" 
href="webadmin/?locale={userLocale}">{portal_admin}</a></div>
-    <div class="welcome-link"><a id="WelcomePage_reports" 
href="services/reports-redirect">{portal_reports}</a></div>
+    <div class="welcome-link"><a id="WelcomePage_reports" 
href="services/reports-base-redirect">{portal_reports}</a></div>
 </div>
 <div class="col-sm-4 col-md-4 col-lg-3 details">
     <div class="welcome-section-title"><span class="">{downloads_title}</div>


-- 
To view, visit http://gerrit.ovirt.org/33493
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I732df3a7d6ebec5915be21bb945889d8660c615c
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Ravi Nori <rn...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to