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

utilize lock unlock events for readonly mode while saving (#17077)

Browse Source
This commit is contained in:
Niels Lyngsø
2024-09-17 09:52:00 +02:00
committed by GitHub
parent 3667217053
commit d58768f26d
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@
appState, contentResource, entityResource, navigationService, notificationsService, contentAppHelper,
serverValidationManager, contentEditingHelper, localizationService, formHelper, umbRequestHelper,
editorState, $http, eventsService, overlayService, $location, localStorageService, treeService,
$exceptionHandler, uploadTracker) {
$exceptionHandler, uploadTracker) {
var evts = [];
var infiniteMode = $scope.infiniteModel && $scope.infiniteModel.infiniteMode;
@@ -497,6 +497,7 @@
//Set them all to be invalid
var fieldsToRollback = checkValidility();
eventsService.emit("content.saving", { content: $scope.content, action: args.action });
eventsService.emit("form.lock");
return contentEditingHelper.contentEditorPerformSave({
saveMethod: args.saveMethod,
@@ -517,6 +518,7 @@
syncTreeNode($scope.content, data.path, false, args.reloadChildren);
eventsService.emit("content.saved", { content: $scope.content, action: args.action, valid: true });
eventsService.emit("form.unlock");
if($scope.contentForm.$invalid !== true) {
resetNestedFieldValiation(fieldsToRollback);
@@ -534,6 +536,7 @@
if (err && err.status === 400 && err.data) {
// content was saved but is invalid.
eventsService.emit("content.saved", { content: $scope.content, action: args.action, valid: false });
eventsService.emit("form.unlock");
}
return $q.reject(err);
@@ -1002,7 +1005,7 @@
const openPreviewWindow = (url, target) => {
// Chromes popup blocker will kick in if a window is opened
// without the initial scoped request. This trick will fix that.
const previewWindow = $window.open(url, target);
previewWindow.addEventListener('load', () => {

13
src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbtabbedcontent.directive.js
View File

@@ -2,7 +2,7 @@
'use strict';
/** This directive is used to render out the current variant tabs and properties and exposes an API for other directives to consume */
function tabbedContentDirective($timeout, $filter, contentEditingHelper, contentTypeHelper) {
function tabbedContentDirective($timeout, $filter, contentEditingHelper, contentTypeHelper, eventsService) {
function link($scope, $element) {
@@ -156,14 +156,13 @@
}
});
$scope.$on("formSubmitting", function() {
$scope.allowUpdate = false;
eventsService.on("form.lock", function() {
$scope.$evalAsync(() => {
$scope.allowUpdate = false;
});
});
$scope.$on("formSubmitted", function() {
setAllowUpdate();
});
$scope.$on("formSubmittedValidationFailed", function() {
eventsService.on("form.unlock", function() {
setAllowUpdate();
});