[rhq] Branch 'hotfix/jon3.1.2' - 2 commits - modules/enterprise

[Larry O'Leary]

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
          |    8 ++++++++

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java
|    1 +
 2 files changed, 9 insertions(+)

New commits:
commit 8b25170f5f32a55a10235daeb68ddd7fdfa16733
Author: Lukas Krejci <lkrejci(a)redhat.com&gt;
Date:   Mon Sep 24 16:44:28 2012 +0200

    [BZ 859982] - Resetting the custom blur event handling before and after a popup dialog
is shown in the configuration editor.
    This prevents unhandled errors when for example entering an entry into the
    list of maps multiple times.
    (cherry picked from commit d41955c0175c795668d8e51ea7b742453a30b5ee)
    (cherry picked from commit 4080f94678c99b4d467693e2b9d4fd4f9fae5b34)

diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
index ebf3507..935545a 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
@@ -1703,6 +1703,10 @@ public class ConfigurationEditor extends LocatableVLayout {
                     summaryTable.redraw();
                 }
 
+                //reset the custom blur event handling - we're destroying the new
form here
+                blurUnsetItem = null;
+                blurValueItem = null;
+
                 layout.destroy();
                 popup.destroy();
             }
@@ -1731,6 +1735,10 @@ public class ConfigurationEditor extends LocatableVLayout {
             buttonBar.addMember(cancelButton);
         }
 
+        //reset the custom blur event handling - we're creating a new form here
+        blurUnsetItem = null;
+        blurValueItem = null;
+
         layout.addMember(buttonBar);
         popup.addItem(layout);
         popup.show();


commit 3f8ed4139e413a499abe5894dbf17c415de7891a
Author: Stefan Negrea <snegrea(a)redhat.com&gt;
Date:   Fri Sep 20 13:21:02 2013 -0500

    [BZ 889602] Force a vertical recalculation after a redraw when loading new data. There
is a problem with IE support in the current GWT version and forcing the toolstrip to get
moved 1px higher is the only workaround.
    
    This bug has been resolved in new versions of GWT so no changes are required in
coregui for branches that use a newer version.
    (cherry picked from commit 070a7971506df4febf733ce67aa040ca875e3819)

diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java
index 0e473a7..c900174 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java
@@ -259,6 +259,7 @@ public class ResourceAutodiscoveryView extends LocatableVLayout
implements Refre
                     //       to cause it to redraw, but it is obviously not reasonable to
expect that. So we must
                     //       explicitly call redraw() here.
                     treeGrid.redraw();
+                    treeGrid.resizeBy(0, -1);
                 }
             }
         });