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

add option to prevent redirect of succesfull saves to new route

Browse Source
This commit is contained in:
Mads Rasmussen
2018-05-09 09:20:23 +02:00
parent d97d1c427e
commit 86c554e3d3
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
View File

@@ -44,6 +44,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
throw "args.saveMethod is not defined";
}
var redirectOnSuccess = args.redirectOnSuccess !== undefined ? args.redirectOnSuccess : true;
var redirectOnFailure = args.redirectOnFailure !== undefined ? args.redirectOnFailure : true;
var self = this;
@@ -63,6 +64,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
self.handleSuccessfulSave({
scope: args.scope,
savedContent: data,
redirectOnSuccess: redirectOnSuccess,
rebindCallback: function() {
rebindCallback.apply(self, [args.content, data]);
}
@@ -562,7 +564,10 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
throw "args.savedContent cannot be null";
}
if (!this.redirectToCreatedContent(args.redirectId ? args.redirectId : args.savedContent.id)) {
// the default behaviour is to redirect on success. This adds option to prevent when false
args.redirectOnSuccess = args.redirectOnSuccess !== undefined ? args.redirectOnSuccess : true;
if (!args.redirectOnSuccess || !this.redirectToCreatedContent(args.redirectId ? args.redirectId : args.savedContent.id)) {
//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.
@@ -586,7 +591,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
*/
redirectToCreatedContent: function (id, modelState) {
//only continue if we are currently in create mode and if there is no 'Name' modelstate errors
//only continue if we are currently in create mode and not in infinite mode and if there is no 'Name' modelstate errors
// since we need at least a name to create content.
if ($routeParams.create && (isValidIdentifier(id) && (!modelState || !modelState["Name"]))) {