yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes exception handling in content editor

Browse Source
This commit is contained in:
Shannon
2020-07-14 16:42:10 +10:00
parent 551a5a82ce
commit 1795153fad
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
View File

@@ -4,7 +4,8 @@
function ContentEditController($rootScope, $scope, $routeParams, $q, $window,
appState, contentResource, entityResource, navigationService, notificationsService,
serverValidationManager, contentEditingHelper, localizationService, formHelper, umbRequestHelper,
editorState, $http, eventsService, overlayService, $location, localStorageService, treeService) {
editorState, $http, eventsService, overlayService, $location, localStorageService, treeService,
$exceptionHandler) {
var evts = [];
var infiniteMode = $scope.infiniteModel && $scope.infiniteModel.infiniteMode;
@@ -620,8 +621,7 @@
model.submitButtonState = "error";
//re-map the dialog model since we've re-bound the properties
dialog.variants = $scope.content.variants;
//don't reject, we've handled the error
return $q.when(err);
$exceptionHandler(err);
});
},
close: function () {
@@ -642,8 +642,9 @@
action: "sendToPublish"
}).then(function () {
$scope.page.buttonGroupState = "success";
}, function () {
}, function (err) {
$scope.page.buttonGroupState = "error";
$exceptionHandler(err);
});;
}
};
@@ -679,8 +680,7 @@
model.submitButtonState = "error";
//re-map the dialog model since we've re-bound the properties
dialog.variants = $scope.content.variants;
//don't reject, we've handled the error
return $q.when(err);
$exceptionHandler(err);
});
},
close: function () {
@@ -703,8 +703,9 @@
action: "publish"
}).then(function () {
$scope.page.buttonGroupState = "success";
}, function () {
}, function (err) {
$scope.page.buttonGroupState = "error";
$exceptionHandler(err);
});
}
};
@@ -742,8 +743,7 @@
model.submitButtonState = "error";
//re-map the dialog model since we've re-bound the properties
dialog.variants = $scope.content.variants;
//don't reject, we've handled the error
return $q.when(err);
$exceptionHandler(err);
});
},
close: function (oldModel) {
@@ -766,8 +766,9 @@
action: "save"
}).then(function () {
$scope.page.saveButtonState = "success";
}, function () {
}, function (err) {
$scope.page.saveButtonState = "error";
$exceptionHandler(err);
});
}
@@ -820,8 +821,7 @@
model.submitButtonState = "error";
//re-map the dialog model since we've re-bound the properties
dialog.variants = Utilities.copy($scope.content.variants);
//don't reject, we've handled the error
return $q.when(err);
$exceptionHandler(err);
});
},
@@ -880,8 +880,7 @@
model.submitButtonState = "error";
//re-map the dialog model since we've re-bound the properties
dialog.variants = $scope.content.variants;
//don't reject, we've handled the error
return $q.when(err);
$exceptionHandler(err);
});
},

14
src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
View File

@@ -165,11 +165,9 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
return; //sometimes oddly this happens, nothing we can do
}
if (!response.status && response.message && response.stack) {
//this is a JS/angular error that we should deal with
return $q.reject({
errorMsg: response.message
});
if (!response.status) {
//this is a JS/angular error
return $q.reject(response);
}
//invoke the callback
@@ -280,7 +278,11 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
//the data returned is the up-to-date data so the UI will refresh
return $q.resolve(response.data);
}, function (response) {
//failure callback
if (!response.status) {
//this is a JS/angular error
return $q.reject(response);
}
//when there's a 500 (unhandled) error show a YSOD overlay if debugging is enabled.
if (response.status >= 500 && response.status < 600) {