@sapui5/sap.fe.core 1.96.16 → 1.96.18

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.fe.core",
-	"version": "1.96.16",
+	"version": "1.96.18",
 	"description": "SAPUI5 Library sap.fe.core",
 	"license": "SEE LICENSE IN LICENSE.txt",
 	"author": "SAP SE (https://www.sap.com)",

package/src/sap/fe/core/.library

@@ -6,7 +6,7 @@
     <copyright>SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     </copyright>
-    <version>1.96.16</version>
+    <version>1.96.18</version>
 
     <documentation>UI5 library: sap.fe.core</documentation>
 

package/src/sap/fe/core/actions/draft.js

@@ -341,42 +341,44 @@ sap.ui.define(
 					var oModel = oContext.getModel(),
 						oResourceBundle,
 						draftDataContext = oModel.bindContext(oContext.getPath() + "/DraftAdministrativeData").getBoundContext();
-					return mParameters.oView
-						.getModel("sap.fe.i18n")
-						.getResourceBundle()
-						.then(function(_oResourceBundle) {
-							oResourceBundle = _oResourceBundle;
-							return draftDataContext.requestObject();
-						})
-						.then(function(draftAdminData) {
-							if (draftAdminData) {
-								// remove all unbound transition messages as we show a special dialog
-								messageHandling.removeUnboundTransitionMessages();
-								var sInfo = draftAdminData.InProcessByUserDescription || draftAdminData.InProcessByUser;
-								var sEntitySet = mParameters.oView.getViewData().entitySet;
-								if (sInfo) {
-									var sLockedByUserMsg = CommonUtils.getTranslatedText(
-										"C_DRAFT_OBJECT_PAGE_DRAFT_LOCKED_BY_USER",
-										oResourceBundle,
-										sInfo,
-										sEntitySet
-									);
-									MessageBox.error(sLockedByUserMsg);
-									throw new Error(sLockedByUserMsg);
-								} else {
-									sInfo = draftAdminData.CreatedByUserDescription || draftAdminData.CreatedByUser;
-									var sUnsavedChangesMsg = CommonUtils.getTranslatedText(
-										"C_DRAFT_OBJECT_PAGE_DRAFT_UNSAVED_CHANGES",
-										oResourceBundle,
-										sInfo,
-										sEntitySet
-									);
-									return showMessageBox(sUnsavedChangesMsg).then(function() {
-										return executeDraftEditAction(oContext, false);
-									});
+					if (mParameters && mParameters.oView) {
+						return mParameters.oView
+							.getModel("sap.fe.i18n")
+							.getResourceBundle()
+							.then(function(_oResourceBundle) {
+								oResourceBundle = _oResourceBundle;
+								return draftDataContext.requestObject();
+							})
+							.then(function(draftAdminData) {
+								if (draftAdminData) {
+									// remove all unbound transition messages as we show a special dialog
+									messageHandling.removeUnboundTransitionMessages();
+									var sInfo = draftAdminData.InProcessByUserDescription || draftAdminData.InProcessByUser;
+									var sEntitySet = mParameters.oView.getViewData().entitySet;
+									if (sInfo) {
+										var sLockedByUserMsg = CommonUtils.getTranslatedText(
+											"C_DRAFT_OBJECT_PAGE_DRAFT_LOCKED_BY_USER",
+											oResourceBundle,
+											sInfo,
+											sEntitySet
+										);
+										MessageBox.error(sLockedByUserMsg);
+										throw new Error(sLockedByUserMsg);
+									} else {
+										sInfo = draftAdminData.CreatedByUserDescription || draftAdminData.CreatedByUser;
+										var sUnsavedChangesMsg = CommonUtils.getTranslatedText(
+											"C_DRAFT_OBJECT_PAGE_DRAFT_UNSAVED_CHANGES",
+											oResourceBundle,
+											sInfo,
+											sEntitySet
+										);
+										return showMessageBox(sUnsavedChangesMsg).then(function() {
+											return executeDraftEditAction(oContext, false);
+										});
+									}
 								}
-							}
-						});
+							});
+					}
 				}
 				return Promise.reject(new Error("Draft creation aborted for document: " + oContext.getPath()));
 			}
@@ -426,9 +428,11 @@ sap.ui.define(
 					if (!bExecute) {
 						throw new Error("Draft creation was aborted by extension for document: " + oContext.getPath());
 					}
-					return executeDraftEditAction(oContext, bRunPreserveChangesFlow).catch(function(oResponse) {
+					return draft.executeDraftEditAction(oContext, bRunPreserveChangesFlow).catch(function(oResponse) {
 						//Only call back if error 409
 						if (bRunPreserveChangesFlow && oResponse.status === 409) {
+							messageHandling.removeBoundTransitionMessages();
+							messageHandling.removeUnboundTransitionMessages();
 							return Promise.resolve(
 								mParam.fnWhenDecisionToOverwriteDocumentIsRequired
 									? mParam.fnWhenDecisionToOverwriteDocumentIsRequired()
@@ -575,7 +579,8 @@ sap.ui.define(
 		var draft = {
 			createDraftFromActiveDocument: createDraftFromActiveDocument,
 			activateDocument: activateDocument,
-			deleteDraft: deleteDraft
+			deleteDraft: deleteDraft,
+			executeDraftEditAction: executeDraftEditAction
 		};
 
 		return draft;

package/src/sap/fe/core/library.js

@@ -106,7 +106,7 @@ sap.ui.define(
 			interfaces: [],
 			controls: [],
 			elements: [],
-			version: "1.96.16",
+			version: "1.96.18",
 			noLibraryCSS: true,
 			extensions: {
 				//Configuration used for rule loading of Support Assistant

package/src/sap/fe/core/messagebundle_pl.properties

@@ -140,7 +140,7 @@ C_COMMON_SAPFE_DATA_RECEIVED_ERROR=Nie mo\u017Cna wczyta\u0107 danych.
 
 C_COMMON_APPLY_ERROR=Wyst\u0105pi\u0142 b\u0142\u0105d podczas wysy\u0142ania zmian. Przejd\u017A wstecz, aby odrzuci\u0107 zmiany, lub spr\u00F3buj wys\u0142a\u0107 je ponownie.
 
-C_COMMON_OBJECT_PAGE_DELETE=Usuwanie
+C_COMMON_OBJECT_PAGE_DELETE=Usu\u0144
 
 C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTINFO=Usun\u0105\u0107 ten obiekt ({1} {0})?