diff --git a/html/gui/js/CCR.js b/html/gui/js/CCR.js
index 8f14d2f34e..7b10abd80c 100644
--- a/html/gui/js/CCR.js
+++ b/html/gui/js/CCR.js
@@ -1746,7 +1746,7 @@ CCR.xdmod.ui.presentFailureResponse = function (response, options) {
// If a user-friendly message was given, add it to the displayed message.
var outputMessage;
if (options.wrapperMessage) {
- outputMessage = options.wrapperMessage + " (" + responseMessage + ")";
+ outputMessage = options.wrapperMessage + '
(' + responseMessage + ')';
} else {
outputMessage = responseMessage;
}
diff --git a/html/gui/js/modules/Usage.js b/html/gui/js/modules/Usage.js
index 4636e239c1..8c35b61c57 100644
--- a/html/gui/js/modules/Usage.js
+++ b/html/gui/js/modules/Usage.js
@@ -1614,16 +1614,29 @@ Ext.extend(XDMoD.Module.Usage, XDMoD.PortalModule, {
handleDataException = function (response, exceptionType) {
var viewer = CCR.xdmod.ui.Viewer.getViewer();
+ if (viewer && viewer.el) {
+ viewer.el.unmask();
+ }
+
+ var options = {};
+
+ view.tpl = new Ext.XTemplate(['', 'An error has occurred.
', '']);
+ view.store.loadData({
+ totalCount: 1,
+ success: true,
+ message: 'Error',
+ data: [
+ {
+ }
+ ]
+ });
+ view.refresh();
if (exceptionType === 'response') {
var data = CCR.safelyDecodeJSONResponse(response) || {};
var errorCode = data.code;
if (errorCode === XDMoD.Error.QueryUnavailableTimeAggregationUnit) {
- if (viewer && viewer.el) {
- viewer.el.unmask();
- }
-
var durationToolbar = self.getDurationSelector();
durationToolbar.setAggregationUnit('Auto');
durationToolbar.onHandle();
@@ -1644,40 +1657,12 @@ Ext.extend(XDMoD.Module.Usage, XDMoD.PortalModule, {
errorMessage += '
' + errorMessageExtraData;
}
}
-
- Ext.MessageBox.alert(
- 'Usage',
- errorMessage
- );
- return;
- }
- var extraInfo = JSON.parse(data.message);
- var groupDescription = extraInfo.description;
- if (extraInfo.statistic !== '') {
- groupDescription += ' by ' + extraInfo.statistic;
+ options.title = 'Usage';
+ options.wrapperMessage = errorMessage;
}
- viewer.el.unmask();
- view.tpl = new Ext.XTemplate(['', '{group_description}
{description}
', '']);
- view.store.loadData({
- totalCount: 1,
- success: true,
- message: 'Error',
- data: [
- {
- group_description: groupDescription,
- description: extraInfo.instructions
- }
- ]
- });
- view.refresh();
- return;
}
- CCR.xdmod.ui.presentFailureResponse(response);
-
- if (viewer && viewer.el) {
- viewer.el.unmask();
- }
+ CCR.xdmod.ui.presentFailureResponse(response, options);
};
// ---------------------------------------------------------
@@ -1788,7 +1773,6 @@ Ext.extend(XDMoD.Module.Usage, XDMoD.PortalModule, {
store: chartStore,
autoScroll: true,
tpl: largeChartTemplate
-
}); //view
// ---------------------------------------------------------
@@ -2675,6 +2659,13 @@ Ext.extend(XDMoD.Module.Usage, XDMoD.PortalModule, {
'Chart: ' + chartStore.getAt(0).get('title') + ', Params: ' + chartStore.getAt(0).get('params_title')
);
+ var serverChartSettings = chartStore.getAt(0).get('chart_settings').replace(/`/g, '"');
+ if (serverChartSettings === '') {
+ serverChartSettings = n.attributes.defaultChartSettings;
+ }
+ n.attributes.chartSettings = serverChartSettings;
+ chartToolbar.fromJSON(n.attributes.chartSettings);
+
self.setImageExport(true);
if (public_user != true)