You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ea...@apache.org on 2017/06/28 17:34:55 UTC
qpid-dispatch git commit: DISPATCH-770 Display error message when a
management operation fails
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 36766377d -> 4e55c604a
DISPATCH-770 Display error message when a management operation fails
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/4e55c604
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/4e55c604
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/4e55c604
Branch: refs/heads/master
Commit: 4e55c604a441df61c2bfc8fce9385646dc737018
Parents: 3676637
Author: Ernest Allen <ea...@redhat.com>
Authored: Wed Jun 28 13:34:32 2017 -0400
Committer: Ernest Allen <ea...@redhat.com>
Committed: Wed Jun 28 13:34:32 2017 -0400
----------------------------------------------------------------------
console/hawtio/src/main/webapp/plugin/js/qdrList.js | 8 ++++----
.../src/main/webapp/plugin/js/qdrOverviewLogsController.js | 2 +-
console/stand-alone/index.html | 1 +
console/stand-alone/plugin/js/qdrList.js | 8 ++++----
console/stand-alone/plugin/js/qdrOverviewLogsController.js | 2 +-
console/stand-alone/plugin/js/qdrService.js | 2 +-
6 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/4e55c604/console/hawtio/src/main/webapp/plugin/js/qdrList.js
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrList.js b/console/hawtio/src/main/webapp/plugin/js/qdrList.js
index 835e938..b2d3806 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrList.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrList.js
@@ -100,8 +100,8 @@ var QDR = (function(QDR) {
$scope.fetchingLog = false;
var statusCode = context.message.application_properties.statusCode;
if (statusCode < 200 || statusCode >= 300) {
- Core.notification('error', context.message.application_properties.statusDescription);
- //QDR.log.debug(context.message.application_properties.statusDescription)
+ Core.notification('error', context.message.statusDescription);
+ //QDR.log.debug(context.message.statusDescription)
return;
}
$scope.logResults = response.filter( function (entry) {
@@ -639,8 +639,8 @@ var QDR = (function(QDR) {
function gotMethodResponse (nodeName, entity, response, context) {
var statusCode = context.message.application_properties.statusCode;
if (statusCode < 200 || statusCode >= 300) {
- Core.notification('error', context.message.application_properties.statusDescription);
- //QDR.log.debug(context.message.application_properties.statusDescription)
+ Core.notification('error', context.message.statusDescription);
+ //QDR.log.debug(context.message.statusDescription)
} else {
var note = entity + " " + $filter('Pascalcase')($scope.currentMode.op) + "d"
Core.notification('success', note);
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/4e55c604/console/hawtio/src/main/webapp/plugin/js/qdrOverviewLogsController.js
----------------------------------------------------------------------
diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrOverviewLogsController.js b/console/hawtio/src/main/webapp/plugin/js/qdrOverviewLogsController.js
index fed1e3d..b366122 100644
--- a/console/hawtio/src/main/webapp/plugin/js/qdrOverviewLogsController.js
+++ b/console/hawtio/src/main/webapp/plugin/js/qdrOverviewLogsController.js
@@ -26,7 +26,7 @@ var QDR = (function(QDR) {
var gotLogInfo = function (nodeId, entity, response, context) {
var statusCode = context.message.application_properties.statusCode;
if (statusCode < 200 || statusCode >= 300) {
- Core.notification('error', context.message.application_properties.statusDescription);
+ Core.notification('error', context.message.statusDescription);
} else {
var levelLogs = response.filter( function (result) {
if (result[1] == null)
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/4e55c604/console/stand-alone/index.html
----------------------------------------------------------------------
diff --git a/console/stand-alone/index.html b/console/stand-alone/index.html
index 1bd1dd3..600fdf8 100644
--- a/console/stand-alone/index.html
+++ b/console/stand-alone/index.html
@@ -134,6 +134,7 @@ under the License.
<script src="https://cdn.rawgit.com/angular-ui/ui-slider/master/src/slider.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/ng-grid/2.0.11/ng-grid.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/notify/0.4.2/notify.min.js"></script>
<script type="text/javascript" src="plugin/js/dispatchPlugin.js"></script>
<script type="text/javascript" src="plugin/js/qdrOverview.js"></script>
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/4e55c604/console/stand-alone/plugin/js/qdrList.js
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/js/qdrList.js b/console/stand-alone/plugin/js/qdrList.js
index b0c78d2..4005178 100644
--- a/console/stand-alone/plugin/js/qdrList.js
+++ b/console/stand-alone/plugin/js/qdrList.js
@@ -100,8 +100,8 @@ var QDR = (function(QDR) {
$scope.fetchingLog = false;
var statusCode = context.message.application_properties.statusCode;
if (statusCode < 200 || statusCode >= 300) {
- Core.notification('error', context.message.application_properties.statusDescription);
- //QDR.log.debug(context.message.application_properties.statusDescription)
+ Core.notification('error', context.message.statusDescription);
+ //QDR.log.debug(context.message.statusDescription)
return;
}
$scope.logResults = response.filter( function (entry) {
@@ -646,8 +646,8 @@ QDR.log.info("we were just disconnected while on the list page. Setting org to r
function gotMethodResponse (nodeName, entity, response, context) {
var statusCode = context.message.application_properties.statusCode;
if (statusCode < 200 || statusCode >= 300) {
- Core.notification('error', context.message.application_properties.statusDescription);
- //QDR.log.debug(context.message.application_properties.statusDescription)
+ Core.notification('error', context.message.statusDescription);
+ QDR.log.debug(context.message.statusDescription)
} else {
var note = entity + " " + $filter('Pascalcase')($scope.currentMode.op) + "d"
Core.notification('success', note);
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/4e55c604/console/stand-alone/plugin/js/qdrOverviewLogsController.js
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/js/qdrOverviewLogsController.js b/console/stand-alone/plugin/js/qdrOverviewLogsController.js
index 832d8aa..91f8f37 100644
--- a/console/stand-alone/plugin/js/qdrOverviewLogsController.js
+++ b/console/stand-alone/plugin/js/qdrOverviewLogsController.js
@@ -26,7 +26,7 @@ var QDR = (function(QDR) {
var gotLogInfo = function (nodeId, entity, response, context) {
var statusCode = context.message.application_properties.statusCode;
if (statusCode < 200 || statusCode >= 300) {
- Core.notification('error', context.message.application_properties.statusDescription);
+ Core.notification('error', context.message.statusDescription);
} else {
var levelLogs = response.filter( function (result) {
if (result[1] == null)
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/4e55c604/console/stand-alone/plugin/js/qdrService.js
----------------------------------------------------------------------
diff --git a/console/stand-alone/plugin/js/qdrService.js b/console/stand-alone/plugin/js/qdrService.js
index 1e57f03..e64eaf2 100644
--- a/console/stand-alone/plugin/js/qdrService.js
+++ b/console/stand-alone/plugin/js/qdrService.js
@@ -347,7 +347,7 @@ console.dump(e)
function gotMethodResponse(nodeName, entity, response, context) {
var statusCode = context.message.application_properties.statusCode;
if (statusCode < 200 || statusCode >= 300) {
- Core.notification('error', context.message.application_properties.statusDescription);
+ Core.notification('error', context.message.statusDescription);
}
}
var attributes = {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org