Alexander Wels has uploaded a new change for review.
Change subject: webadmin: version in feedback url.
......................................................................
webadmin: version in feedback url.
- Added the ability to specify the version of ovirt in the
feedback url.
- Added version retrieval to get the configuration from the
cache.
- Renamed getRpmVersionFromPublic to be non public.
Change-Id: Ib7f4305ff1e3bd30aa13f1ba381186cf9e910c71
Signed-off-by: Alexander Wels <aw...@redhat.com>
---
M
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/AboutPopupPresenterWidget.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AboutPopupPresenterWidget.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java
M packaging/branding/ovirt.brand/external_resources.properties
6 files changed, 38 insertions(+), 22 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/07/21807/1
diff --git
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java
index a680326..a042fce 100644
---
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java
+++
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java
@@ -242,8 +242,8 @@
*
* @return The feedback URL.
*/
- public final String feedbackUrl() {
- return getString(DynamicMessageKey.FEEDBACK_URL);
+ public final String feedbackUrl(final String version) {
+ return formatString(DynamicMessageKey.FEEDBACK_URL, version);
}
/**
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
index b9ccff8..5f5857b 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
@@ -1361,7 +1361,7 @@
Frontend.RunQuery(VdcQueryType.GetGlusterVolumeRebalanceStatus,
parameters, aQuery);
}
- public static void getRpmVersionViaPublic(AsyncQuery aQuery) {
+ public static void getRpmVersion(AsyncQuery aQuery) {
aQuery.converterCallback = new IAsyncConverter() {
@Override
public Object Convert(Object source, AsyncQuery _asyncQuery)
@@ -1369,10 +1369,10 @@
return source != null ? (String) source : ""; //$NON-NLS-1$
}
};
- Frontend.RunPublicQuery(VdcQueryType.GetConfigurationValue,
- new
GetConfigurationValueParameters(ConfigurationValues.ProductRPMVersion,
- getDefaultConfigurationVersion()),
- aQuery);
+ GetConfigurationValueParameters tempVar =
+ new
GetConfigurationValueParameters(ConfigurationValues.ProductRPMVersion);
+ tempVar.setVersion(getDefaultConfigurationVersion());
+ getConfigFromCache(tempVar, aQuery);
}
public static void getUserMessageOfTheDayViaPublic(AsyncQuery aQuery) {
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/AboutPopupPresenterWidget.java
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/AboutPopupPresenterWidget.java
index 76b1381..9d650ef 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/AboutPopupPresenterWidget.java
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/AboutPopupPresenterWidget.java
@@ -39,7 +39,7 @@
}
};
- AsyncDataProvider.getRpmVersionViaPublic(_asyncQuery);
+ AsyncDataProvider.getRpmVersion(_asyncQuery);
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AboutPopupPresenterWidget.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AboutPopupPresenterWidget.java
index 709f3d2..c6d0041 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AboutPopupPresenterWidget.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AboutPopupPresenterWidget.java
@@ -39,7 +39,7 @@
}
};
- AsyncDataProvider.getRpmVersionViaPublic(_asyncQuery);
+ AsyncDataProvider.getRpmVersion(_asyncQuery);
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java
index 6eb3bc3..160dab4 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java
@@ -4,6 +4,9 @@
import org.ovirt.engine.ui.common.presenter.AbstractHeaderPresenterWidget;
import org.ovirt.engine.ui.common.utils.WebUtils;
import
org.ovirt.engine.ui.common.widget.tab.AbstractHeadlessTabPanel.TabWidgetHandler;
+import org.ovirt.engine.ui.frontend.AsyncQuery;
+import org.ovirt.engine.ui.frontend.INewAsyncCallback;
+import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider;
import org.ovirt.engine.ui.webadmin.ApplicationDynamicMessages;
import
org.ovirt.engine.ui.webadmin.section.main.presenter.popup.configure.ConfigurePopupPresenterWidget;
@@ -37,8 +40,9 @@
private final SearchPanelPresenterWidget searchPanel;
private final AboutPopupPresenterWidget aboutPopup;
private final ConfigurePopupPresenterWidget configurePopup;
- private final String feedbackUrl;
+ private String feedbackUrl;
private final String feedbackLinkLabel;
+ private final ApplicationDynamicMessages dynamicMessages;
@Inject
public HeaderPresenterWidget(EventBus eventBus, ViewDef view, CurrentUser
user,
@@ -50,8 +54,8 @@
this.searchPanel = searchPanel;
this.aboutPopup = aboutPopup;
this.configurePopup = configurePopup;
- this.feedbackUrl = dynamicMessages.feedbackUrl();
this.feedbackLinkLabel = dynamicMessages.feedbackLinkLabel();
+ this.dynamicMessages = dynamicMessages;
}
@Override
@@ -86,16 +90,6 @@
RevealRootPopupContentEvent.fire(HeaderPresenterWidget.this,
aboutPopup);
}
}));
-
- if (feedbackUrl != null && feedbackUrl.length() > 0) {
- getView().setFeedbackText(feedbackLinkLabel);
- registerHandler(getView().getFeedbackLink().addClickHandler(new
ClickHandler() {
- @Override
- public void onClick(ClickEvent event) {
- WebUtils.openUrlInNewWindow(feedbackLinkLabel,
feedbackUrl);
- }
- }));
- }
}
@Override
@@ -103,6 +97,28 @@
super.onReveal();
setInSlot(TYPE_SetSearchPanel, searchPanel);
+ configureFeedbackUrl();
}
+ private void configureFeedbackUrl() {
+ AsyncQuery _asyncQuery = new AsyncQuery();
+ _asyncQuery.setModel(this);
+ _asyncQuery.asyncCallback = new INewAsyncCallback() {
+ @Override
+ public void onSuccess(Object model, Object result) {
+ String version = (String) result;
+ feedbackUrl = dynamicMessages.feedbackUrl(version);
+ if (feedbackUrl != null && feedbackUrl.length() > 0) {
+ getView().setFeedbackText(feedbackLinkLabel);
+
registerHandler(getView().getFeedbackLink().addClickHandler(new ClickHandler() {
+ @Override
+ public void onClick(ClickEvent event) {
+ WebUtils.openUrlInNewWindow(feedbackLinkLabel,
feedbackUrl);
+ }
+ }));
+ }
+ }
+ };
+ AsyncDataProvider.getRpmVersion(_asyncQuery);
+ }
}
diff --git a/packaging/branding/ovirt.brand/external_resources.properties
b/packaging/branding/ovirt.brand/external_resources.properties
index d9de400..25b29a5 100644
--- a/packaging/branding/ovirt.brand/external_resources.properties
+++ b/packaging/branding/ovirt.brand/external_resources.properties
@@ -2,7 +2,7 @@
# For messages that are supposed to be translated please use
messages.properties.
# Feedback URL
-obrand.webadmin.feedback_url=mailto:us...@ovirt.org
+obrand.webadmin.feedback_url=mailto:us...@ovirt.org?subject=feedback-on-oVirt-engine-{0}
# Guide URL
obrand.webadmin.guide_url=http://www.ovirt.org/Documentation
--
To view, visit http://gerrit.ovirt.org/21807
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7f4305ff1e3bd30aa13f1ba381186cf9e910c71
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Alexander Wels <aw...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
