modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java | 4 +++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java | 2 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java | 4 ++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java | 2 -- 4 files changed, 8 insertions(+), 4 deletions(-)
New commits: commit 20d86d50221eae48bf6b753b43ba0956687c1a55 Author: Mike Thompson mithomps@redhat.com Date: Mon Oct 28 20:14:26 2013 -0700
[BZ 1014571 ] Fix issue with chart drag date selection not keeping the opened charts across a refresh. Turn off the autosave that triggers an autorefresh for a drag selection.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java index 077a504..f9e7e5a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractD3GraphListView.java @@ -88,7 +88,9 @@ public abstract class AbstractD3GraphListView extends EnhancedVLayout implements if (isVisible() && !isRefreshing()) { isRefreshing = true; try { - buttonBarDateTimeRangeEditor.updateTimeRangeToNow(); + if(!buttonBarDateTimeRangeEditor.isCustomTimeRangeActive()){ + buttonBarDateTimeRangeEditor.updateTimeRangeToNow(); + } refreshData(); } finally { isRefreshing = false; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java index 561f961..8e73e06 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java @@ -210,7 +210,7 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout { if (null != prefs.begin && null != prefs.end && prefs.begin > prefs.end) { CoreGUI.getMessageCenter().notify(new Message(MSG.view_measureTable_startBeforeEnd())); } else { - measurementUserPreferences.setMetricRangePreferences(prefs, allowPreferenceUpdateRefresh); + measurementUserPreferences.setMetricRangePreferencesNoRefresh(prefs); }
} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java index 50d5400..07e95e4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java @@ -100,6 +100,10 @@ public class MeasurementUserPreferences { setMetricRangePreferences(prefs, true); }
+ public void setMetricRangePreferencesNoRefresh(MetricRangePreferences prefs) { + setMetricRangePreferences(prefs, false); + } + /** * @param prefs The updated preferences * @param allowRefresh setting false will inhibit a preference change from calling CoreGui.refresh(). By diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java index a897969..83abeaf 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java @@ -58,8 +58,6 @@ public class UserPreferences { preferencesThatShouldNeverCauseRefresh.add(UserPreferenceNames.RECENT_RESOURCES); // this is auto-set while navigating around and does not affect the current page preferencesThatShouldNeverCauseRefresh.add(UserPreferenceNames.RECENT_RESOURCE_GROUPS); - // for graphs changing the date will not autoupdate when we already handle it - preferencesThatShouldNeverCauseRefresh.add(UserPreferenceNames.MONITOR_VISIBILITY_METRIC_RANGE); // this update is already applied to current portlets by the dashboard impl preferencesThatShouldNeverCauseRefresh.add(UserPreferenceNames.PAGE_REFRESH_PERIOD); }
rhq-commits@lists.fedorahosted.org