[BZ 1083479] - Second invocation of about dialog fails - creating the…

… dialog from scratch (instead of using the cached instance that was causing the issue). Also adding a link to GitHub commit corresponding to the build number (only for RHQ).
rhq-project · Aug 6, 2014 · 177ee40 · 177ee40
1 parent dad83f3
commit 177ee40
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/...enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/SystemSettingsView.java b/...enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/SystemSettingsView.java
@@ -716,8 +716,9 @@ public void onSuccess(ServerDetails result) {
                 ProductInfo productInfo = result.getProductInfo();
                 form.setValue(productName.getName(), productInfo.getName());
                 form.setValue(productVersion.getName(), productInfo.getVersion());
-                form.setValue(productBuildNumber.getName(), productInfo.getBuildNumber());
-
+                form.setValue(productBuildNumber.getName(), productInfo.getBuildNumber()
+                    + (CoreGUI.isRHQ() ? " (<a target='_blank' href='https://github.com/rhq-project/rhq/commit/"
+                        + productInfo.getBuildNumber() + "'>GitHub</a>)" : ""));
                 Map<Detail, String> details = result.getDetails();
                 form.setValue(serverName.getName(), details.get(ServerDetails.Detail.SERVER_IDENTITY));
                 form.setValue(serverTimezone.getName(), details.get(ServerDetails.Detail.SERVER_TIMEZONE));

diff --git a/...erprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/AboutModalWindow.java b/...erprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/AboutModalWindow.java
@@ -77,7 +77,9 @@ private static Canvas buildAboutCanvas(ProductInfo productInfo) {
         version.setWrapTitle(false);
 
         StaticTextItem buildNumber = new StaticTextItem("buildnumber", MSG.view_aboutBox_buildNumber());
-        buildNumber.setValue(productInfo.getBuildNumber());
+        buildNumber.setValue(productInfo.getBuildNumber()
+            + (CoreGUI.isRHQ() ? " (<a target='_blank' href='https://github.com/rhq-project/rhq/commit/"
+                + productInfo.getBuildNumber() + "'>GitHub</a>)" : ""));
         buildNumber.setWrap(false);
         buildNumber.setWrapTitle(false);
 

diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/menu/MenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/menu/MenuBarView.java
@@ -168,7 +168,6 @@ public class MenuBarView extends EnhancedVLayout {
     public static final ViewName LOGOUT_VIEW_ID = new ViewName("LogOut", MSG.view_menuBar_logout());
     private final ProductInfo productInfo = CoreGUI.get().getProductInfo();
     private String currentlySelectedSection = DashboardsView.VIEW_ID.getName();
-    private AboutModalWindow aboutModalWindow;
     private MessageBar messageBar;
     private MessageCenterView messageCenter;
     private FavoritesButton favoritesButton;
@@ -183,7 +182,6 @@ public MenuBarView() {
     protected void onInit() {
         super.onInit();
         setZIndex(1);
-        aboutModalWindow = new AboutModalWindow(productInfo);
         messageCenter = new MessageCenterView();
         messageBar = new MessageBar();
         // messageBar.setHeight(1);
@@ -244,7 +242,7 @@ public void showMessageCenterWindow() {
 
     // called via JSNI - RHQ on logo click
     public void showAboutBox() {
-        aboutModalWindow.show();
+        new AboutModalWindow(productInfo).show();
     }
 
     public MessageBar getMessageBar() {