Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.virgo.management.console/src/main/webapp/js/common.js7
-rw-r--r--org.eclipse.virgo.management.console/src/main/webapp/js/wirings.js2
2 files changed, 7 insertions, 2 deletions
diff --git a/org.eclipse.virgo.management.console/src/main/webapp/js/common.js b/org.eclipse.virgo.management.console/src/main/webapp/js/common.js
index 0dde0088..58e82dd9 100644
--- a/org.eclipse.virgo.management.console/src/main/webapp/js/common.js
+++ b/org.eclipse.virgo.management.console/src/main/webapp/js/common.js
@@ -565,7 +565,12 @@ var Server = function(){
}];
util.doBulkQuery(request, function(response) {
- var virgo = ['OSGi Container', response[0].value.info.product + ' ' + response[0].value.info.version + ' (' + response[0].value.info.extraInfo.type + ')'];
+ var virgo;
+ if(response[0].value.info.extraInfo){
+ virgo = ['OSGi Container', response[0].value.info.product + ' ' + response[0].value.info.version + ' (' + response[0].value.info.extraInfo.type + ')'];
+ }else{
+ virgo = ['OSGi Container', response[0].value.info.product + ' ' + response[0].value.info.version];
+ }
var runtime = ['Virtual Machine', response[5].value + ' version ' + response[6].value + ' (' + response[4].value + ')'];
var os = ['Operating System', response[1].value + ' ' + response[2].value + ' (' + response[3].value + ')'];
callback([virgo, runtime, os]);
diff --git a/org.eclipse.virgo.management.console/src/main/webapp/js/wirings.js b/org.eclipse.virgo.management.console/src/main/webapp/js/wirings.js
index 473f0dc4..06ef75e9 100644
--- a/org.eclipse.virgo.management.console/src/main/webapp/js/wirings.js
+++ b/org.eclipse.virgo.management.console/src/main/webapp/js/wirings.js
@@ -148,7 +148,7 @@ var GeminiDataSource = function(){
}
});
}else{
- $("#main-button-container").after($('<div />', {'class': 'warning-note'}).text('Region ' + region + ' is not publishing management information, unable to display it\'s bundles'));
+ $("#main-button-container").after($('<div />', {'class': 'warning-note'}).text('Region ' + region + ' does not contain Gemini Management, unable to display its bundles'));
};
});
callback();

Back to the top