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

Gets notification msgs on the server side to be displayed. Fixes property existence checking... was checking on id before but that is incorrect, needs to be on alias since a new property id is gen'd on each save and we're not re-wiring them back up. Fixes YSOD messaging for content as well. Changes the ModelState to modelState to be consistent in js.

Browse Source
This commit is contained in:
Shannon
2013-07-22 18:16:50 +10:00
parent ae2ed17050
commit feb1892e9e
10 changed files with 97 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/Umbraco.Web.UI.Client/src/common/services/notifications.service.js
View File

@@ -42,7 +42,55 @@ angular.module('umbraco.services')
}
return {
/**
/**
* @ngdoc method
* @name umbraco.services.notificationsService#showNotification
* @methodOf umbraco.services.notificationsService
*
* @description
* Shows a notification based on the object passed in, normally used to render notifications sent back from the server
*
* @returns {Object} args notification object
*/
showNotification: function(args) {
if (!args) {
throw "args cannot be null";
}
if (!args.type) {
throw "args.type cannot be null";
}
if (!args.header) {
throw "args.header cannot be null";
}
if (!args.message) {
throw "args.message cannot be null";
}
switch(args.type) {
case 0:
//save
this.success(args.header, args.message);
break;
case 1:
//info
this.success(args.header, args.message);
break;
case 2:
//error
this.error(args.header, args.message);
break;
case 3:
//success
this.success(args.header, args.message);
break;
case 4:
//warning
this.warning(args.header, args.message);
break;
}
},
/**
* @ngdoc method
* @name umbraco.services.notificationsService#success
* @methodOf umbraco.services.notificationsService

51
src/Umbraco.Web.UI.Client/src/common/services/util.service.js
View File

@@ -441,12 +441,24 @@ function umbRequestHelper($http, $q, umbDataFormatter, angularHelper, dialogServ
function (data, status, headers, config) {
//failure callback
deferred.reject({
data: data,
status: status,
headers: headers,
config: config
});
//when there's a 500 (unhandled) error show a YSOD overlay if debugging is enabled.
if (status >= 500 && status < 600 && Umbraco.Sys.ServerVariables["isDebuggingEnabled"] === true) {
dialogService.ysodDialog({
errorMsg: 'An error occurred',
data: data
});
}
else {
//return an error object including the error message for UI
deferred.reject({
errorMsg: 'An error occurred',
data: data,
status: status
});
}
});
return deferred.promise;
@@ -675,7 +687,7 @@ angular.module('umbraco.services').factory('iconHelper', iconHelper);
* @name umbraco.services.contentEditingHelper
* @description A helper service for content controllers when editing/creating/saving content.
**/
function contentEditingHelper($location, $routeParams, notificationsService, serverValidationManager) {
function contentEditingHelper($location, $routeParams, notificationsService, serverValidationManager, dialogService) {
return {
@@ -742,7 +754,7 @@ function contentEditingHelper($location, $routeParams, notificationsService, ser
* @function
*
* @description
* A function to handle the validation (ModelState) errors collection which will happen on a 403 error indicating validation errors
* A function to handle the validation (modelState) errors collection which will happen on a 403 error indicating validation errors
* It's worth noting that when a 403 occurs, the data is still saved just never published, though this depends on if the entity is a new
* entity and whether or not the data fulfils the absolute basic requirements like having a mandatory Name.
*/
@@ -806,11 +818,11 @@ function contentEditingHelper($location, $routeParams, notificationsService, ser
//Or, some strange server error
if (err.status === 403) {
//now we need to look through all the validation errors
if (err.data && (err.data.ModelState)) {
if (err.data && (err.data.modelState)) {
this.handleValidationErrors(err.data, err.data.ModelState);
this.handleValidationErrors(err.data, err.data.modelState);
if (!this.redirectToCreatedContent(err.data.id, err.data.ModelState)) {
if (!this.redirectToCreatedContent(err.data.id, err.data.modelState)) {
//we are not redirecting because this is not new content, it is existing content. In this case
// we need to detect what properties have changed and re-bind them with the server data. Then we need
// to re-bind any server validation errors after the digest takes place.
@@ -821,14 +833,12 @@ function contentEditingHelper($location, $routeParams, notificationsService, ser
//indicates we've handled the server result
return true;
}
else {
//TODO: Implement an overlay showing the full YSOD like we had in v5
notificationsService.error("Server error", err);
else {
dialogService.ysodDialog(err);
}
}
else {
//TODO: Implement an overlay showing the full YSOD like we had in v5
notificationsService.error("Validation failed", err);
dialogService.ysodDialog(err);
}
return false;
@@ -859,14 +869,11 @@ function contentEditingHelper($location, $routeParams, notificationsService, ser
if (!args.newContent) {
throw "args.newContent cannot be null";
}
if (!args.notifyHeader) {
throw "args.notifyHeader cannot be null";
}
if (!args.notifyMsg) {
throw "args.notifyMsg cannot be null";
for (var i = 0; i < args.newContent.notifications.length;i++) {
notificationsService.showNotification(args.newContent.notifications[i]);
}
notificationsService.success(args.notifyHeader, args.notifyMsg);
args.scope.$broadcast("saved", { scope: args.scope });
if (!this.redirectToCreatedContent(args.scope.content.id)) {
//we are not redirecting because this is not new content, it is existing content. In this case

2
src/Umbraco.Web.UI.Client/src/views/common/dialogs/ysod.html
View File

@@ -4,7 +4,7 @@
<h1>{{error.errorMsg}}</h1>
<hr />
<h2>{{error.data.ExceptionMessage}}</h2>
<h2>{{error.data.ExceptionMessage || error.data.Message}}</h2>
<div>
<b>Description: </b>An unhandled exception occurred during the execution of the current web request. Please review the stack trace for more information about the error and where it originated in the code.
<br />

4
src/Umbraco.Web.UI.Client/src/views/content/contentedit.controller.js
View File

@@ -62,9 +62,7 @@ function ContentEditController($scope, $routeParams, $location, contentResource,
.then(function (data) {
contentEditingHelper.handleSuccessfulSave({
scope: $scope,
newContent: data,
notifyHeader: "Published",
notifyMsg: "Content has been saved and published"
newContent: data
});
}, function (err) {
contentEditingHelper.handleSaveError(err, $scope);

2
src/Umbraco.Web.UI.Client/test/unit/common/services/content-editing-helper.spec.js
View File

@@ -22,7 +22,7 @@ describe('contentEditingHelper tests', function () {
data: content,
status: 403
};
err.data.ModelState = {};
err.data.modelState = {};
//act
var handled = contentEditingHelper.handleSaveError(err, {content: content});