@sapui5/sap.suite.ui.generic.template 1.120.42 → 1.120.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.120.42",
+  "version": "1.120.44",
   "description": "SAPUI5 Library sap.suite.ui.generic.template",
   "keywords": [
     "sapui5",

package/src/sap/suite/ui/generic/template/.library

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2015 SAP SE. All rights reserved
 	</copyright>
-	<version>1.120.42</version>
+	<version>1.120.44</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/i18n/i18n_id.properties

@@ -63,9 +63,9 @@ VISUAL_FILTER_CHART_TYPE_Donut=Bagan Donat
 
 VISUAL_FILTER_SORTING=Pengurutan
 
-VISUAL_FILTER_SORTING_ASCENDING=Urutan Naik
+VISUAL_FILTER_SORTING_ASCENDING=Menaik
 
-VISUAL_FILTER_SORTING_DESCENDING=Urutan Turun
+VISUAL_FILTER_SORTING_DESCENDING=Menurun
 
 VISUAL_FILTER_LINE_CHART_TIME_LINE=Tampilkan
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.120.42"
+			"version": "1.120.44"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/Canvas/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.120.42"
+			"version": "1.120.44"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_id.properties

@@ -92,7 +92,7 @@ LOCKED_OBJECT_FILTER=Dikunci oleh Pengguna Lain
 
 UNSAVED_CHANGES=Perubahan Belum Disimpan
 
-UNSAVED_CHANGES_FILTER=Perubahan oleh Pengguna Lain yang Belum Disimpan
+UNSAVED_CHANGES_FILTER=Perubahan yang Belum Disimpan oleh Pengguna Lain
 
 SHARE=Bagikan
 

package/src/sap/suite/ui/generic/template/ListReport/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.120.42"
+			"version": "1.120.44"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ObjectPage/controller/ControllerImplementation.js

@@ -1503,7 +1503,7 @@ sap.ui.define([
 						return null;
 					}
 					if (controlHelper.isSmartField(oControl)){ // check whether the SmartField is the correct target for focussing
-						return  controlHelper.getSmartFieldIsFocussableForInputPromise(oControl).then(function(bIsFocussable){
+						return  controlHelper.getSmartFieldIsFocussableForInputPromise(oControl, true).then(function(bIsFocussable){
 							return bIsFocussable && oControl; // If the SmartField has turned out to be focussable take it. Otherwise no need to investigate the subtree below it.
 						});
 					}
@@ -1563,7 +1563,7 @@ sap.ui.define([
 						//set the focus on the control passed by application
 						if (controlHelper.isSmartField(oFocusControl)) {
 							// check whether the SmartField is the correct target for focussing
-							controlHelper.getSmartFieldIsFocussableForInputPromise(oFocusControl).then(function (bIsFocusable) {
+							controlHelper.getSmartFieldIsFocussableForInputPromise(oFocusControl, true).then(function (bIsFocusable) {
 								if (bIsFocusable) {
 									controlHelper.focusUI5Control(oFocusControl);
 								} else {

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_de.properties

@@ -17,9 +17,9 @@ DRAFT_VERSION=Entwurf
 
 SAVE=Sichern
 
-SAVE_AND_EDIT=Sichern und Bearbeiten
+SAVE_AND_EDIT=Sichern und bearbeiten
 
-SAVE_AND_NEXT=Sichern und Weiter
+SAVE_AND_NEXT=Sichern und weiter
 
 VALIDATE_DRAFT=Validieren
 

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_id.properties

@@ -57,7 +57,7 @@ MSG_SUBTITLE_ROW_HIDDEN_COLUMN_HIDDEN=Baris (Sembunyi)\: {0}, Kolom (Sembunyi)\:
 
 CONTACT_INFO=Informasi Kontak
 
-CONTACT_JOB_TITLE=Judul Pekerjaan
+CONTACT_JOB_TITLE=Jabatan Pekerjaan
 
 CONTACT_DEPARTMENT=Departemen
 

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_pt.properties

@@ -17,7 +17,7 @@ DRAFT_VERSION=Esbo\u00E7o
 
 SAVE=Salvar
 
-SAVE_AND_EDIT=Salvar e editar
+SAVE_AND_EDIT=Gravar e editar
 
 SAVE_AND_NEXT=Gravar e seguinte
 

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_uk.properties

@@ -19,7 +19,7 @@ SAVE=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438
 
 SAVE_AND_EDIT=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 \u0456 \u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438
 
-SAVE_AND_NEXT=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 \u0456 \u043F\u0440\u043E\u0434\u043E\u0432\u0436\u0438\u0442\u0438
+SAVE_AND_NEXT=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 \u0442\u0430 \u0434\u0430\u043B\u0456
 
 VALIDATE_DRAFT=\u041F\u0435\u0440\u0435\u0432\u0456\u0440\u0438\u0442\u0438
 

package/src/sap/suite/ui/generic/template/ObjectPage/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.120.42"
+			"version": "1.120.44"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickCreate/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.120.42"
+			"version": "1.120.44"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickView/manifest.json

@@ -6,7 +6,7 @@
 	"type": "component",
 	"i18n": "i18n/i18n.properties",
 	"applicationVersion": {
-		"version": "1.120.42"
+		"version": "1.120.44"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/detailTemplates/detailUtils.js

@@ -160,7 +160,24 @@ sap.ui.define([	"sap/suite/ui/generic/template/genericUtilities/FeLogger", "sap/
 			function fnApplyAndUp(oEvent) {
 				var oControl = oEvent.getSource();
 				var oCRUDActionHandler = oTemplateUtils.oComponentUtils.getCRUDActionHandler();
-				oCRUDActionHandler.handleCRUDScenario(2, fnApplyAndUpImpl.bind(null, oControl));
+
+				// Pre-check validation to decide navigation
+				var oAppComponent = oController.getOwnerComponent().getAppComponent();
+				var oManifestSettings = oAppComponent.getManifest()["sap.ui.generic.app"];
+				var bNavigateImmediately = oManifestSettings &&
+										oManifestSettings.settings &&
+										oManifestSettings.settings.applyButtonNavigatesImmediately;
+				if (bNavigateImmediately) {
+					oCRUDActionHandler.hasValidationMessageOnDetailsViews().then(function(bHasValidationErrors) {
+						if (!bHasValidationErrors) {
+							// No frontend errors - navigate immediately
+							fnNavigateUp();
+							oTemplateUtils.oServices.oApplicationController.synchronizeDraftAsync();
+						}
+					});
+				} else  {
+					oCRUDActionHandler.handleCRUDScenario(2, fnApplyAndUpImpl.bind(null, oControl));
+				}
 			}
 
 			var oDiscardEditHandler; // singleton, initialized on demand

package/src/sap/suite/ui/generic/template/genericUtilities/controlHelper.js

@@ -1,24 +1,27 @@
-sap.ui.define(["sap/ui/dom/getFirstEditableInput", "sap/suite/ui/generic/template/genericUtilities/FeLogger"], function(getFirstEditableInput, FeLogger) {
+sap.ui.define([
+	"sap/ui/dom/getFirstEditableInput",
+	"sap/suite/ui/generic/template/genericUtilities/FeLogger"
+], function(getFirstEditableInput, FeLogger) {
 		"use strict";
-		
+
 	var oFeLogger = new FeLogger("genericUtilities.controlHelper");
 	var oLogger = oFeLogger.getLogger();
-	
+
 	var byId = sap.ui.getCore().byId;
-	
+
 	function isControlOfType(sPathToType, oControl){
 		var FNClass = sap.ui.require(sPathToType);
         return typeof FNClass === "function" && (oControl instanceof FNClass);
 	}
-	
+
 	function getUI5ControlForDomElement(oDom){
 	    for (; oDom; oDom = oDom.parentNode) {
 	        if (oDom.hasAttribute && oDom.hasAttribute("data-sap-ui")) {
 				return sap.ui.getCore().byId(oDom.id);
 	        }
-	    }		
+	    }
 	}
-	
+
 	function focusUI5Control(oControl, oFocusInfo){
 		if (oControl && oControl.focus) {
 			oLogger.debug("Set focus on control with id " + oControl.getId());
@@ -40,9 +43,9 @@ sap.ui.define(["sap/ui/dom/getFirstEditableInput", "sap/suite/ui/generic/templat
 			if (oTest !== oControl){
 				oLogger.warning(oCurrentFocus ? ("Focus is now on control with id " + oCurrentFocus.getId()) : "There is no focus now");
 			}
-		}		
+		}
 	}
-	
+
 	function focusDom(oDom, oFocusInfo){
 		var oUi5Control = getUI5ControlForDomElement(oDom);
 		focusUI5Control(oUi5Control, oFocusInfo);
@@ -54,12 +57,12 @@ sap.ui.define(["sap/ui/dom/getFirstEditableInput", "sap/suite/ui/generic/templat
 	}
 
 	// returns a Promise that resolves to the boolean information whether the SmartField is a possible focus target for input.
-	function getSmartFieldIsFocussableForInputPromise(oSmartField) {
+	function getSmartFieldIsFocussableForInputPromise(oSmartField, isSmartForm) {
 		return oSmartField._getComputedMetadata().then(function () {
 			return (oSmartField.getMode() === "edit") && (oSmartField._getICRenderedPromise() || Promise.resolve());
 		}).then(function () {
-			var oFirstFocusableInput = !oSmartField._bEdmBoolDetected && getFirstEditableInput(oSmartField.getDomRef());
-			return !(!oFirstFocusableInput || oFirstFocusableInput.type === "checkbox");
+			var oFirstFocusableInput = (!oSmartField._bEdmBoolDetected || isSmartForm) && getFirstEditableInput(oSmartField.getDomRef());
+			return !(!oFirstFocusableInput || (oFirstFocusableInput.type === "checkbox" && !isSmartForm));
 		}).catch(function () {
 			return false;
 		});
@@ -70,7 +73,7 @@ sap.ui.define(["sap/ui/dom/getFirstEditableInput", "sap/suite/ui/generic/templat
 	function getControlWithFocus(){
 		return getUI5ControlForDomElement(document.activeElement);
 	}
-	
+
 	// If oChild is identified to be invisible, null is returned. Otherwise its parent is returned.
 	// If the parent does not exist a faulty value is returned.
 	// This is a heuristic method.
@@ -99,7 +102,7 @@ sap.ui.define(["sap/ui/dom/getFirstEditableInput", "sap/suite/ui/generic/templat
 		}
 		return vRet;
 	}
-	
+
 // Return a list of all children of the given control (in the 'correct' order). Only implemented for certain control types.
 	// For the other control types it returns null or an empty array depending on bAlwaysReturnAList.
 	function getChildren(oControl, bAlwaysReturnAList){
@@ -113,7 +116,7 @@ sap.ui.define(["sap/ui/dom/getFirstEditableInput", "sap/suite/ui/generic/templat
 			return oControl.getBlocks().concat(oControl.getMoreBlocks());
 		}
 		if (isControlOfType("sap/ui/comp/smartform/Group", oControl)){
-			return oControl.getFormElements();	
+			return oControl.getFormElements();
 		}
 		if (isControlOfType("sap/ui/table/Column", oControl)){
 			var aRet = oControl.getMultiLabels();
@@ -121,11 +124,11 @@ sap.ui.define(["sap/ui/dom/getFirstEditableInput", "sap/suite/ui/generic/templat
 			if (oLabel){
 				aRet.push(oLabel);
 			}
-			return aRet;	
-		}				
+			return aRet;
+		}
 		return bAlwaysReturnAList ? [] : null;
 	}
-	
+
 	// Sorter that compares the position of two child controls which have a common parent.
 	// Returns a positive integer when oChild1 is larger, a negative number if oChild2 is larger, and 0 if they are identical.
 	// Depends on getChildren() being implemented for commonParent. If this is not the case, at least a reproducable order is guaranteed.
@@ -146,13 +149,13 @@ sap.ui.define(["sap/ui/dom/getFirstEditableInput", "sap/suite/ui/generic/templat
 				}
 				if (iPositionCompare & Node.DOCUMENT_POSITION_FOLLOWING){
 					return -1;
-				}				
+				}
 			}
 			return 1 - 2 * (!oDomRef1 === !oDomRef2 ? oChild1.getId() < oChild2.getId() : !oDomRef2); // if we cannot determine a reasonable order we still want to have a reproducable order. Note that elements with DomRef must clearly be separated from those without.
 		}
 		return (iPos1 >= 0 && iPos2 >= 0) ? (iPos1 - iPos2) : (iPos2 - iPos1); // if only one child has been identified in the list of children it takes precedence.
 	}
-	
+
 	// This function defines which instances of sap.ui.core.Element are relevant for investigation (Currently used in fnSearchInTree).
 	// They must posess a property 'visible' (which is guaranteed for all instances of sap.ui.core.Control) which is true.
 	// If they have a property 'enabled' this must be true as well.
@@ -162,7 +165,7 @@ sap.ui.define(["sap/ui/dom/getFirstEditableInput", "sap/suite/ui/generic/templat
 			return checkForRelevance(oCell);
 		})	: (typeof oElement.getVisible === "function" && oElement.getVisible() && (typeof oElement.getEnabled !== "function" || oElement.getEnabled()));
 	}
-	
+
 	// This function allows a depth-first search in an element tree starting with root oElement
 	// Thereby, the following logic is applied
 	// - Children of an element are determined by function getChildren in this class. If this provides an empty array method findElements of the element is used
@@ -174,14 +177,14 @@ sap.ui.define(["sap/ui/dom/getFirstEditableInput", "sap/suite/ui/generic/templat
 	// Note that mAlreadyAnalyzed will be updated by this function
 	// fnHandleElement(oElement) is a function that will be called on all relevant elements of the tree.
 	// This function can work asynchronously (i.e. return a Promise) or synchronously (i.e. return something which is not a Promise) on a case-by-case basis.
-	// In the second case the return value will be considered as the result of the function. In the first case the value the Promise resolves to will be considered as the result. 
+	// In the second case the return value will be considered as the result of the function. In the first case the value the Promise resolves to will be considered as the result.
 	// If the result is a truthy value for one element this value is considered as the result of fnSearchInTree and the processing is stopped.
 	// fnSearchInTree returns this result synchronously if all calls of fnHandleElement which have been performed until then have worked synchronously.
 	// If the result of fnHandleElement is faulty the depth-first search of the tree proceeds. Thereby the processing of the subtree of oElement is
 	// skipped if the result was exactly false. For other faulty values the subtree will be processed next.
 	// Note that this process will never work on two elements in parallel. If the processing of one element is asynchronous the process is interrupted until
 	// the result of this step is available. Only then  the next element will be analyzed.
-	// If fnHandleElement never results in a truthy value then fnSearchInTree results in null. 
+	// If fnHandleElement never results in a truthy value then fnSearchInTree results in null.
 	function fnSearchInTree(mAlreadyAnalyzed, oElement, fnHandleElement){
 		mAlreadyAnalyzed = mAlreadyAnalyzed || Object.create(null);
 		var sId = oElement.getId();
@@ -199,7 +202,7 @@ sap.ui.define(["sap/ui/dom/getFirstEditableInput", "sap/suite/ui/generic/templat
 			if (!aChildren){ // if getChildren does not care for the control type of oElement
 				aChildren = oElement.findElements(false);
 				aChildren.sort(fnSortChildControls.bind(null, oElement));
-			}		
+			}
 			aChildren.some(function(oChild){
 				vResult = fnSearchInTree(mAlreadyAnalyzed, oChild, fnHandleElement);
 				return vResult; // If vResult is truthy it is either a Promise (which makes the processing asynchronous) or the result of fnSearchInTree. In both cases we should stop now.
@@ -219,7 +222,7 @@ sap.ui.define(["sap/ui/dom/getFirstEditableInput", "sap/suite/ui/generic/templat
 		}
 		// When coming here we have synchronously either found a node with a truthy result or have processed the whole tree without finding any truthy result
 		mAlreadyAnalyzed[sId] = 2;
-		return vResult || null;		
+		return vResult || null;
 	}
 
 	var oControlHelper =  {
@@ -261,10 +264,10 @@ sap.ui.define(["sap/ui/dom/getFirstEditableInput", "sap/suite/ui/generic/templat
 		sortChildControls: fnSortChildControls,
 		searchInTree: fnSearchInTree.bind(null, null)
 	};
-	
+
 	oControlHelper.isTable = function(oControl){
 		return oControlHelper.isSmartTable(oControl) || oControlHelper.isUiTable(oControl) || oControlHelper.isMTable(oControl);
 	};
-	
+
 	return oControlHelper;
 });

package/src/sap/suite/ui/generic/template/lib/AppComponent.js

@@ -939,7 +939,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.UIComponent
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.120.42
+	 * @version 1.120.44
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	return UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {
@@ -994,6 +994,10 @@ sap.ui.define([
 					type: "string",
 					defaultValue: "Middle"
 				},
+				applyButtonNavigatesImmediately : {
+					type:"boolean",
+					defaultValue: false
+				},
 				//The column layout is used by default in the SmartForm on the object page
 				useColumnLayoutForSmartForm: {
 					type: "boolean",

package/src/sap/suite/ui/generic/template/lib/CRUDHelper.js

@@ -333,67 +333,105 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 		}
 
 		/*
-		Allows direct edit on the entires on the list, unlike the method 'edit'above, this method first edit the entry with preserveChanges as true
-		If the response indicates an unsaved change or locked record, a corresponding dialog is shown to proceed or cancel with the edit.
-		*/
-		function directEdit(oTransactionController, sEntitySet, sBindingPath, oModel, oApplication, oCommonUtils, oViewDependencyHelper, oViewProxy, bOpenInEditMode){
+		 * Initiates editing of a list entry directly (without navigating to the object page first).
+		 * Unlike the 'edit' method above, the first editEntity call uses preserveChanges=true.
+		 * If the backend responds with a 409 (conflict) the DraftAdministrativeData is read to
+		 * distinguish between a locked record and a record with unsaved changes by another user.
+		 * A corresponding dialog is shown to let the user decide how to proceed.
+		 *
+		 * @param {object}  oTransactionController  - transaction controller providing editEntity
+		 * @param {string}  sEntitySet              - name of the entity set
+		 * @param {object}  oBindingContext          - UI5 Context of the row being edited;
+		 *                                            the OData model and binding path are derived
+		 *                                            from it via .getModel() / .getPath()
+		 * @param {object}  oApplication            - application proxy (busy helper, component utils, …)
+		 * @param {string}  sAppId                  - ID of the AppComponent; used as the localStorage cache
+		 *                                            key for the content-id batch optimisation
+		 * @param {object}  oCommonUtils             - common utilities (getText, …)
+		 * @param {object}  oViewDependencyHelper    - used to mark the root page as dirty
+		 * @param {object}  oViewProxy               - used for navigateUp on cancellation
+		 * @param {boolean} bOpenInEditMode          - whether the page was opened directly in edit mode
+		 */
+		function directEdit(oTransactionController, sEntitySet, oBindingContext, oApplication, sAppId, oCommonUtils, oViewDependencyHelper, oViewProxy, bOpenInEditMode){
 			var oDraftContext = oTransactionController.getDraftController().getDraftContext();
-			var oPromise = new Promise(function(resolve,reject) {
-				oModel.createBindingContext(sBindingPath, null, null, function(oBindingContext){
-					if (oDraftContext.isDraftEnabled(sEntitySet)) {
-						oTransactionController.editEntity(oBindingContext, true).then(function(oResponse) {
-							oBindingContext.getModel().invalidateEntry(oBindingContext);
-							oViewDependencyHelper.setRootPageToDirty();
-							resolve({
-								context: oResponse.context
-							});
-						}, function(oResponse) {
-							if (oResponse && oResponse.response && oResponse.response.statusCode === "409") {
-								//remove transient message associated with rc 409 in order to prevent message pop-up
-								oApplication.removeTransientMessages();
-								fnReadDraftAdministrativeData(oModel, sBindingPath, oApplication.getBusyHelper()).then(
-									function(oResponse) {
-										if (oResponse.DraftAdministrativeData.InProcessByUser) {
-											reject({
-												lockedByUser: oResponse.DraftAdministrativeData.InProcessByUserDescription || oResponse.DraftAdministrativeData.InProcessByUser
-											});
-										} else { //unsaved changes
-											var editConfirmation = function(){
-											var oUnsavedChangesEditPromise = oTransactionController.editEntity(oBindingContext, false).then(function(oResponse){
-													oBindingContext.getModel().invalidateEntry(oBindingContext);
-													oViewDependencyHelper.setRootPageToDirty();
-													resolve({
-														context: oResponse.context
-													});
-												});
-												oApplication.getBusyHelper().setBusy(oUnsavedChangesEditPromise, true);
-											};
-											var editRejection = reject({
-												cancelled: true
-											});
-											var unSavedChangesDialogPromise = fnUnsavedChangesDialog(undefined, oResponse.DraftAdministrativeData,oCommonUtils, oViewProxy, bOpenInEditMode);
-											unSavedChangesDialogPromise.then(editConfirmation,editRejection);
-										}
-									},
-									function(oResponse) {
-										// DraftAdminData read failed
+
+			if (!oDraftContext.isDraftEnabled(sEntitySet)) {
+				return Promise.resolve({ context: oBindingContext });
+			}
+
+			var oModel = oBindingContext.getModel();
+			// Fetch sRootExpand for the content-id batch optimisation.
+			// getRootExpand is intentionally not provided: directEdit is always invoked from
+			// the List Report before the Object Page is active, so getRootExpand is not yet
+			// available. CacheHelper falls back to the localStorage cache, which is still
+			// much faster than fetching expands in a separate backend request.
+			var oInfoForContentIdPromise = CacheHelper.getInfoForContentIdPromise(sEntitySet, oModel, sAppId);
+
+			var oRet = oInfoForContentIdPromise.then(function(oInfoObject) {
+				var sRootExpand = oInfoObject.contentIdRequestPossible ? oInfoObject.parametersForContentIdRequest.sRootExpand : null;
+
+				return new Promise(function(resolve, reject) {
+					var oFirstEditPromise = oTransactionController.editEntity(oBindingContext, true, sRootExpand);
+					// Track the busy state against the individual network request so the busy
+					// indicator remains active for exactly as long as the request is in flight.
+					oApplication.getBusyHelper().setBusy(oFirstEditPromise, true);
+					oFirstEditPromise.then(function(oResponse) {
+						oModel.invalidateEntry(oBindingContext);
+						oViewDependencyHelper.setRootPageToDirty();
+						resolve({ context: oResponse.context });
+					}, function(oResponse) {
+						if (oResponse && oResponse.response && oResponse.response.statusCode === "409") {
+							//remove transient message associated with rc 409 in order to prevent message pop-up
+							oApplication.removeTransientMessages();
+							fnReadDraftAdministrativeData(oModel, oBindingContext.getPath(), oApplication.getBusyHelper()).then(
+								function(oResponse) {
+									if (oResponse.DraftAdministrativeData.InProcessByUser) {
 										reject({
-											draftAdminReadResponse: oResponse
+											lockedByUser: oResponse.DraftAdministrativeData.InProcessByUserDescription || oResponse.DraftAdministrativeData.InProcessByUser
 										});
-									});
-									oApplication.getBusyHelper().setBusy(oPromise, true);
-							} else {
-								reject(oResponse);
-							}
-						});
-				} else {
-					return resolve({
-						context: oBindingContext
+									} else { //unsaved changes
+										var editConfirmation = function() {
+											// Re-run editEntity without preserveChanges so the
+											// unsaved changes of another user are overwritten.
+											var oUnsavedChangesEditPromise = oTransactionController.editEntity(oBindingContext, false, sRootExpand).then(function(oResponse) {
+												oModel.invalidateEntry(oBindingContext);
+												oViewDependencyHelper.setRootPageToDirty();
+												resolve({ context: oResponse.context });
+											});
+											oApplication.getBusyHelper().setBusy(oUnsavedChangesEditPromise, true);
+										};
+										// editRejection is passed as the rejection handler of Promise.then(),
+										// so it must be a function reference; calling reject() inline here
+										// would execute it immediately instead of on dialog cancellation.
+										var editRejection = function() { reject({ cancelled: true }); };
+										var unSavedChangesDialogPromise = fnUnsavedChangesDialog(undefined, oResponse.DraftAdministrativeData, oCommonUtils, oViewProxy, bOpenInEditMode);
+										unSavedChangesDialogPromise.then(editConfirmation, editRejection);
+									}
+								},
+								function(oResponse) {
+									// DraftAdminData read failed
+									reject({ draftAdminReadResponse: oResponse });
+								}
+							);
+						} else {
+							reject(oResponse);
+						}
 					});
-				}
 				});
 			});
-			return oPromise;
+
+			// Ensure the active context is registered in ContextBookkeeping before the edit
+			// resolves. This caches the draft sibling path so subsequent navigation can use
+			// the cached value without an additional /SiblingEntity request.
+			// editingStarted() notifies all listeners (e.g. the message button helper) that
+			// the editing phase has begun for this context.
+			var bContextRegistered = oApplication.checkContextData(oBindingContext);
+			if (!bContextRegistered) {
+				oApplication.registerContext(oBindingContext, 1, sEntitySet);
+			}
+			oApplication.editingStarted(oBindingContext, oRet);
+
+			return oRet;
 		}
 
 		function deleteEntity(oDraftController, fnExecuteDelete, oApplicationProxy, oContext, bIsActiveEntity, sActionType){

package/src/sap/suite/ui/generic/template/lib/CommonEventHandlers.js

@@ -166,7 +166,10 @@ sap.ui.define(["sap/ui/base/Object",
 					oCurrentPaginatorInfo = oRet; // make sure that the navigation below does not create a new paginator info but reuses the existing one
 					onListNavigate(oSourceItem, oState, oTargetContext, true, oViewProxy);
 				};
-				if (bIsActive && bIsEditItem){ // in this case oListBinding (and thus oContext which was derived from it) points to the active version, but we are already in the draft version
+				var oComponent = oController.getOwnerComponent();
+				var bOpenInEditMode = !!oComponent.getEditFlow && oComponent.getEditFlow() === "direct";
+
+				if (bIsActive && bIsEditItem && !bOpenInEditMode){ // in this case oListBinding (and thus oContext which was derived from it) points to the active version, but we are already in the draft version
 					oServices.oApplication.registerContext(oContext, oComponentUtils.getViewLevel() + 1); // determine the sibling context
 					var oSiblingPromise = oServices.oApplication.getDraftSiblingPromise(oContext);        // as the "real" target of this pagination
 					oSiblingPromise.then(fnPaginateImpl);
@@ -1582,7 +1585,10 @@ sap.ui.define(["sap/ui/base/Object",
 			var bOpenInEditMode = !!oComponent.getEditFlow && oComponent.getEditFlow() === "direct";
 			if (bOpenInEditMode){
 				var sEntitySet = oTable.getEntitySet();
-				var oEditPromise = CRUDHelper.directEdit(oServices.oTransactionController, sEntitySet, oBindingContext.sPath, oBindingContext.getModel(), oServices.oApplication, oCommonUtils, oServices.oViewDependencyHelper, oViewProxy, bOpenInEditMode);
+				// oBindingContext is passed directly; the OData model and binding path are resolved inside directEdit.
+				// sAppId is derived here because oController is not accessible inside CRUDHelper.
+				var sAppId = oComponent.getAppComponent().getId();
+				var oEditPromise = CRUDHelper.directEdit(oServices.oTransactionController, sEntitySet, oBindingContext, oServices.oApplication, sAppId, oCommonUtils, oServices.oViewDependencyHelper, oViewProxy, bOpenInEditMode);
 				oEditPromise.then(function(oResult){
 					oCommonUtils.navigateFromListItem(oResult.context, bReplace, bOpenInEditMode);
 				}, function(oError){

package/src/sap/suite/ui/generic/template/lib/navigation/NavigationController.js

@@ -3094,7 +3094,7 @@ sap.ui.define(["sap/ui/base/Object",
 	 * @param {sap.suite.ui.generic.template.lib.AppComponent} oAppComponent The AppComponent instance
 	 * @public
 	 * @extends sap.ui.base.Object
-	 * @version 1.120.42
+	 * @version 1.120.44
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

package/src/sap/suite/ui/generic/template/library.js

@@ -60,7 +60,7 @@ sap.ui.define([
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.120.42",
+		version: "1.120.44",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {