Merge "Migrate to AngularJS v1.8.2"
This commit is contained in:
commit
453a73d2b6
|
@ -77,10 +77,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
function afterCheck(result) {
|
function afterCheck(result) {
|
||||||
var outcome = $q.reject(); // Reject the promise by default
|
var outcome = $q.reject().catch(angular.noop); // Reject the promise by default
|
||||||
if (result.fail.length > 0) {
|
if (result.fail.length > 0) {
|
||||||
toast.add('error', getMessage(notAllowedMessage, result.fail));
|
toast.add('error', getMessage(notAllowedMessage, result.fail));
|
||||||
outcome = $q.reject(result.fail);
|
outcome = $q.reject(result.fail).catch(angular.noop);
|
||||||
}
|
}
|
||||||
if (result.pass.length > 0) {
|
if (result.pass.length > 0) {
|
||||||
outcome = deleteModal.open(scope, result.pass.map(getEntity), context).then(createResult);
|
outcome = deleteModal.open(scope, result.pass.map(getEntity), context).then(createResult);
|
||||||
|
|
|
@ -77,10 +77,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
function afterCheck(result) {
|
function afterCheck(result) {
|
||||||
var outcome = $q.reject(); // Reject the promise by default
|
var outcome = $q.reject().catch(angular.noop); // Reject the promise by default
|
||||||
if (result.fail.length > 0) {
|
if (result.fail.length > 0) {
|
||||||
toast.add('error', getMessage(notAllowedMessage, result.fail));
|
toast.add('error', getMessage(notAllowedMessage, result.fail));
|
||||||
outcome = $q.reject(result.fail);
|
outcome = $q.reject(result.fail).catch(angular.noop);
|
||||||
}
|
}
|
||||||
if (result.pass.length > 0) {
|
if (result.pass.length > 0) {
|
||||||
outcome = deleteModal.open(scope, result.pass.map(getEntity), context).then(createResult);
|
outcome = deleteModal.open(scope, result.pass.map(getEntity), context).then(createResult);
|
||||||
|
|
Loading…
Reference in New Issue