This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
The following commit(s) were added to refs/heads/master by this push:
new 6f6f917 Solver error showing entitlements messages
new d026583 Merge pull request #128 from jcabrerizo/fixEntitlementMSGs
6f6f917 is described below
commit 6f6f9174e28013c8d1015a74bbdfe6941259ad8a
Author: Juan Cabrerizo <j...@cloudsoft.io>
AuthorDate: Fri Mar 22 10:26:37 2019 +0000
Solver error showing entitlements messages
---
ui-modules/location-manager/app/views/detail/detail.controller.js | 2 +-
.../location-manager/app/views/wizard/advanced/advanced.controller.js | 2 +-
ui-modules/location-manager/app/views/wizard/byon/byon.controller.js | 2 +-
ui-modules/location-manager/app/views/wizard/cloud/cloud.controller.js | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ui-modules/location-manager/app/views/detail/detail.controller.js
b/ui-modules/location-manager/app/views/detail/detail.controller.js
index 426c1a9..01c0818 100644
--- a/ui-modules/location-manager/app/views/detail/detail.controller.js
+++ b/ui-modules/location-manager/app/views/detail/detail.controller.js
@@ -86,7 +86,7 @@ export function detailController($scope, $filter, $state,
$stateParams, brSnackb
$state.go('locations');
brSnackbar.create('Location "' +
$filter('locationName')(vm.location) + '" deleted successfully');
}).catch(error => {
- brSnackbar.create('Could not delete this location: ' +
error.message);
+ brSnackbar.create('Could not delete this location: ' +
error.error.message);
});
};
vm.editLocation = function () {
diff --git
a/ui-modules/location-manager/app/views/wizard/advanced/advanced.controller.js
b/ui-modules/location-manager/app/views/wizard/advanced/advanced.controller.js
index 975d9c3..0107bc2 100644
---
a/ui-modules/location-manager/app/views/wizard/advanced/advanced.controller.js
+++
b/ui-modules/location-manager/app/views/wizard/advanced/advanced.controller.js
@@ -78,7 +78,7 @@ export function wizardAdvancedController($element, $state,
brSnackbar, location,
catalogApi.create(payload).then(data => {
$state.go('detail', {symbolicName: vm.id, version: vm.version});
}).catch(error => {
- brSnackbar.create('Could not save location: ' + error.data.message
? error.data.message : error.data);
+ brSnackbar.create('Could not save location: ' +
error.error.message ? error.error.message : error.data);
});
};
diff --git
a/ui-modules/location-manager/app/views/wizard/byon/byon.controller.js
b/ui-modules/location-manager/app/views/wizard/byon/byon.controller.js
index c12c789..51ab1db 100644
--- a/ui-modules/location-manager/app/views/wizard/byon/byon.controller.js
+++ b/ui-modules/location-manager/app/views/wizard/byon/byon.controller.js
@@ -95,7 +95,7 @@ export function wizardByonController($element, $state,
brSnackbar, location, cat
catalogApi.create(payload).then(data => {
$state.go('detail', {symbolicName: vm.id, version: vm.version});
}).catch(error => {
- brSnackbar.create('Could not save location: ' + error.data.message
? error.data.message : error.data);
+ brSnackbar.create('Could not save location: ' +
error.error.message ? error.error.message : error.error);
});
};
diff --git
a/ui-modules/location-manager/app/views/wizard/cloud/cloud.controller.js
b/ui-modules/location-manager/app/views/wizard/cloud/cloud.controller.js
index 4e015c4..996a156 100644
--- a/ui-modules/location-manager/app/views/wizard/cloud/cloud.controller.js
+++ b/ui-modules/location-manager/app/views/wizard/cloud/cloud.controller.js
@@ -102,7 +102,7 @@ export function wizardCloudController($element, $state,
brSnackbar, locationSpec
catalogApi.create(payload).then(data => {
$state.go('detail', {symbolicName: vm.id, version: vm.version});
}).catch(error => {
- brSnackbar.create('Could not save location: ' + error.data.message
? error.data.message : error.data);
+ brSnackbar.create('Could not save location: ' +
error.error.message ? error.error.message : error.error);
});
};
