From cb4f4323f5748744753712949266235a2ba395ff Mon Sep 17 00:00:00 2001 From: dzonidoo Date: Wed, 3 Jul 2024 14:45:51 +0200 Subject: [PATCH 1/2] fix multiedit action 'save article' --- .../apps/authoring/authoring/services/AuthoringService.ts | 8 +++++++- scripts/apps/authoring/multiedit/multiedit.ts | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/apps/authoring/authoring/services/AuthoringService.ts b/scripts/apps/authoring/authoring/services/AuthoringService.ts index b973cf0bea..fd05ec0b34 100644 --- a/scripts/apps/authoring/authoring/services/AuthoringService.ts +++ b/scripts/apps/authoring/authoring/services/AuthoringService.ts @@ -546,13 +546,16 @@ export function AuthoringService( */ this.save = function saveAuthoring( origItem: IArticle, - _item: IArticle, + __item: IArticle, requestEditor3DirectivesToGenerateHtml?: Array<()=> void>, + cloneAfterGenerateHtml?: boolean, ) { for (const fn of (requestEditor3DirectivesToGenerateHtml ?? [])) { fn(); } + const _item = cloneAfterGenerateHtml === true ? cloneDeep(__item) : __item; + return authoringApiCommon.saveBefore(_item, origItem).then((item: IArticle) => { angular.extend(_item, item); @@ -603,6 +606,9 @@ export function AuthoringService( const authoringWorkspace: AuthoringWorkspaceService = $injector.get('authoringWorkspace'); authoringWorkspace.update(origItem); + + console.log(__item, '__item'); // monitoring good, multiedit bad one + return origItem; }); } diff --git a/scripts/apps/authoring/multiedit/multiedit.ts b/scripts/apps/authoring/multiedit/multiedit.ts index 67df8dfff3..b0981bb76f 100644 --- a/scripts/apps/authoring/multiedit/multiedit.ts +++ b/scripts/apps/authoring/multiedit/multiedit.ts @@ -252,8 +252,9 @@ function MultieditArticleDirective(authoring, content, multiEdit, lock, $timeout scope.save = function() { return authoring.save( scope.origItem, - cloneDeep(scope.item), + scope.item, scope.requestEditor3DirectivesToGenerateHtml, + true, ).then((res) => { scope.dirty = false; InitializeMedia.initMedia(scope); From d13ded2c1c1a19d272ba9e906e2ca295b35f6c3d Mon Sep 17 00:00:00 2001 From: dzonidoo Date: Wed, 3 Jul 2024 14:56:36 +0200 Subject: [PATCH 2/2] changes after review --- .../apps/authoring/authoring/services/AuthoringService.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/apps/authoring/authoring/services/AuthoringService.ts b/scripts/apps/authoring/authoring/services/AuthoringService.ts index fd05ec0b34..84423da2b6 100644 --- a/scripts/apps/authoring/authoring/services/AuthoringService.ts +++ b/scripts/apps/authoring/authoring/services/AuthoringService.ts @@ -548,13 +548,13 @@ export function AuthoringService( origItem: IArticle, __item: IArticle, requestEditor3DirectivesToGenerateHtml?: Array<()=> void>, - cloneAfterGenerateHtml?: boolean, + cloneAfterGeneratingHtml?: boolean, ) { for (const fn of (requestEditor3DirectivesToGenerateHtml ?? [])) { fn(); } - const _item = cloneAfterGenerateHtml === true ? cloneDeep(__item) : __item; + const _item = cloneAfterGeneratingHtml === true ? cloneDeep(__item) : __item; return authoringApiCommon.saveBefore(_item, origItem).then((item: IArticle) => { angular.extend(_item, item); @@ -607,8 +607,6 @@ export function AuthoringService( authoringWorkspace.update(origItem); - console.log(__item, '__item'); // monitoring good, multiedit bad one - return origItem; }); }