Hello Alexander Wels,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/17653
to review the following change.
Change subject: userportal,webadmin: version in welcome page
......................................................................
userportal,webadmin: version in welcome page
- Fixed issue that caused myVersion to be displayed
instead of the actual version.
- Removed unused engineVersion.js file.
Change-Id: I4a0e28386e00b15e3f222e353965104be50d3938
Signed-off-by: Alexander Wels <[email protected]>
---
M Makefile
M
backend/manager/modules/root/src/main/java/org/ovirt/engine/core/WelcomeServlet.java
M backend/manager/modules/root/src/main/webapp/WEB-INF/ovirt-engine.jsp
D backend/manager/modules/root/src/main/webapp/engineVersion.js
M
backend/manager/modules/root/src/test/java/org/ovirt/engine/core/WelcomeServletTest.java
5 files changed, 2 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/17653/1
diff --git a/Makefile b/Makefile
index 98bdac5..1d0e73f 100644
--- a/Makefile
+++ b/Makefile
@@ -312,9 +312,6 @@
install -dm 0755 "$(DESTDIR)$(PKG_EAR_DIR)"
find "$(MAVEN_OUTPUT_DIR)" -name '*.ear' -type f | grep -v tmp.repos |
xargs -n 1 unzip -q -o -d "$(DESTDIR)$(PKG_EAR_DIR)"
- # TODO: remove some day
- sed -i "s/MYVERSION/$(DISPLAY_VERSION)/"
"$(DESTDIR)$(PKG_EAR_DIR)/root.war/engineVersion.js"
-
install_poms:
install -dm 755 "$(DESTDIR)$(MAVENPOM_DIR)"
install -m 644 backend/manager/modules/bll/pom.xml
"$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-bll.pom"
diff --git
a/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/WelcomeServlet.java
b/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/WelcomeServlet.java
index 4901fed..4e3f511 100644
---
a/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/WelcomeServlet.java
+++
b/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/WelcomeServlet.java
@@ -101,7 +101,7 @@
List<BrandingTheme> brandingThemes =
brandingManager.getBrandingThemes();
request.setAttribute(THEMES_KEY, brandingThemes);
request.setAttribute(APPLICATION_TYPE,
BrandingTheme.ApplicationType.WELCOME);
- String oVirtVersion = (String)
backend.RunQuery(VdcQueryType.GetConfigurationValue,
+ String oVirtVersion = (String)
backend.RunPublicQuery(VdcQueryType.GetConfigurationValue,
new
GetConfigurationValueParameters(ConfigurationValues.ProductRPMVersion,
ConfigCommon.defaultConfigurationVersion)).getReturnValue();
request.setAttribute(VERSION, oVirtVersion != null ? oVirtVersion :
"myVersion");
diff --git
a/backend/manager/modules/root/src/main/webapp/WEB-INF/ovirt-engine.jsp
b/backend/manager/modules/root/src/main/webapp/WEB-INF/ovirt-engine.jsp
index 2c61aef..d5029e5 100644
--- a/backend/manager/modules/root/src/main/webapp/WEB-INF/ovirt-engine.jsp
+++ b/backend/manager/modules/root/src/main/webapp/WEB-INF/ovirt-engine.jsp
@@ -14,7 +14,6 @@
</c:if>
</c:forEach>
</c:if>
- <script src="engineVersion.js" type="text/javascript"></script>
<script src="splash.js" type="text/javascript"></script>
</head>
<body onload="pageLoaded()">
diff --git a/backend/manager/modules/root/src/main/webapp/engineVersion.js
b/backend/manager/modules/root/src/main/webapp/engineVersion.js
deleted file mode 100644
index 9e61d71..0000000
--- a/backend/manager/modules/root/src/main/webapp/engineVersion.js
+++ /dev/null
@@ -1 +0,0 @@
-var myVersion = "MYVERSION";
diff --git
a/backend/manager/modules/root/src/test/java/org/ovirt/engine/core/WelcomeServletTest.java
b/backend/manager/modules/root/src/test/java/org/ovirt/engine/core/WelcomeServletTest.java
index a04510d..5c0c2c6 100644
---
a/backend/manager/modules/root/src/test/java/org/ovirt/engine/core/WelcomeServletTest.java
+++
b/backend/manager/modules/root/src/test/java/org/ovirt/engine/core/WelcomeServletTest.java
@@ -53,7 +53,7 @@
private void mockBackendQuery(VdcQueryType queryType, Object returnValue) {
VdcQueryReturnValue queryReturnValueMock =
when(mock(VdcQueryReturnValue.class).getReturnValue())
.thenReturn(returnValue).getMock();
- when(mockBackend.RunQuery(eq(queryType),
any(VdcQueryParametersBase.class)))
+ when(mockBackend.RunPublicQuery(eq(queryType),
any(VdcQueryParametersBase.class)))
.thenReturn(queryReturnValueMock);
}
--
To view, visit http://gerrit.ovirt.org/17653
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a0e28386e00b15e3f222e353965104be50d3938
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Alon Bar-Lev <[email protected]>
Gerrit-Reviewer: Alexander Wels <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
