[Engine-patches] Change in ovirt-engine[master]: webadmin: version in feedback url.

[awels]

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.

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/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java
2 files changed, 30 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/38/21738/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 762f3ee..ccab3e9 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
@@ -251,8 +251,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/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..5740328 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.getRpmVersionViaPublic(_asyncQuery);
+    }
 }


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

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