npm - @openui5/sap.ui.core - Versions diffs - 1.120.18 → 1.120.20 - Mend

@openui5/sap.ui.core 1.120.18 → 1.120.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (312) hide show

package/src/sap/ui/model/MetaModel.js CHANGED Viewed

@@ -16,7 +16,7 @@ sap.ui.define(['./Model'],
 	 * @extends sap.ui.model.Model
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @public
 	 * @alias sap.ui.model.MetaModel

package/src/sap/ui/model/Model.js CHANGED Viewed

@@ -51,7 +51,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.message.MessageProcessor
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @public
 	 * @alias sap.ui.model.Model

package/src/sap/ui/model/SelectionModel.js CHANGED Viewed

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/base/EventProvider', "sap/base/assert"],
 	 * @extends sap.ui.base.EventProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @param {int} iSelectionMode <code>sap.ui.model.SelectionModel.SINGLE_SELECTION</code> or <code>sap.ui.model.SelectionModel.MULTI_SELECTION</code>
 	 *

package/src/sap/ui/model/SimpleType.js CHANGED Viewed

@@ -46,7 +46,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Type
 	 * @public
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 */
 	var SimpleType = Type.extend("sap.ui.model.SimpleType", /** @lends sap.ui.model.SimpleType.prototype */ {

package/src/sap/ui/model/TreeAutoExpandMode.js CHANGED Viewed

@@ -12,7 +12,7 @@ sap.ui.define([],
 	/**
 	 * Different modes for setting the auto expand mode on tree or analytical bindings.
 	 *
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 * @enum {string}
 	 * @alias sap.ui.model.TreeAutoExpandMode
 	 * @protected

package/src/sap/ui/model/Type.js CHANGED Viewed

@@ -19,7 +19,7 @@ sap.ui.define(['sap/ui/base/Object'],
 	 *
 	 * @extends sap.ui.base.Object
 	 * @public
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 */
 	var Type = BaseObject.extend("sap.ui.model.Type", /** @lends sap.ui.model.Type.prototype */ {

package/src/sap/ui/model/json/JSONModel.js CHANGED Viewed

@@ -48,7 +48,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.ClientModel
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 * @public
 	 * @alias sap.ui.model.json.JSONModel
 	 */

package/src/sap/ui/model/message/MessageModel.js CHANGED Viewed

@@ -29,7 +29,7 @@ sap.ui.define(['sap/ui/model/BindingMode', 'sap/ui/model/ClientModel', 'sap/ui/m
 	 * @extends sap.ui.model.ClientModel
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @public
 	 * @alias sap.ui.model.message.MessageModel

package/src/sap/ui/model/odata/ODataAnnotations.js CHANGED Viewed

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @author SAP SE
 	 * @version
-	 * 1.120.18
+	 * 1.120.20
 	 *
 	 * @public
 	 * @deprecated As of version 1.66, please use {@link sap.ui.model.odata.v2.ODataAnnotations} instead.

package/src/sap/ui/model/odata/ODataMessageParser.js CHANGED Viewed

@@ -85,7 +85,7 @@ var sClassName = "sap.ui.model.odata.ODataMessageParser",
  * @extends sap.ui.core.message.MessageParser
  *
  * @author SAP SE
- * @version 1.120.18
+ * @version 1.120.20
  * @public
  * @alias sap.ui.model.odata.ODataMessageParser
  */

package/src/sap/ui/model/odata/ODataMetaModel.js CHANGED Viewed

@@ -881,7 +881,7 @@ sap.ui.define([
 	 * {@link #loaded loaded} has been resolved!
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 * @alias sap.ui.model.odata.ODataMetaModel
 	 * @extends sap.ui.model.MetaModel
 	 * @public

package/src/sap/ui/model/odata/ODataMetadata.js CHANGED Viewed

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * Implementation to access OData metadata
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.ODataMetadata

package/src/sap/ui/model/odata/ODataModel.js CHANGED Viewed

@@ -78,7 +78,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @public
 	 * @deprecated As of version 1.48, please use {@link sap.ui.model.odata.v2.ODataModel} instead.

package/src/sap/ui/model/odata/type/Boolean.js CHANGED Viewed

@@ -87,7 +87,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @alias sap.ui.model.odata.type.Boolean
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Byte.js CHANGED Viewed

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @alias sap.ui.model.odata.type.Byte
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Currency.js CHANGED Viewed

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.type.Currency
 	 * @public
 	 * @since 1.63.0
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 */
 	var Currency = BaseCurrency.extend("sap.ui.model.odata.type.Currency", {
 		constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/Date.js CHANGED Viewed

@@ -75,7 +75,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @alias sap.ui.model.odata.type.Date
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/DateTime.js CHANGED Viewed

@@ -61,7 +61,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.DateTimeBase
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @alias sap.ui.model.odata.type.DateTime
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/DateTimeBase.js CHANGED Viewed

@@ -92,7 +92,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.27.0
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 */
 	var DateTimeBase = ODataType.extend("sap.ui.model.odata.type.DateTimeBase", {
 			constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/DateTimeOffset.js CHANGED Viewed

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.DateTimeBase
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @alias sap.ui.model.odata.type.DateTimeOffset
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/DateTimeWithTimezone.js CHANGED Viewed

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @public
 	 * @see {sap.ui.model.odata.v2.ODataModel#bindProperty}
 	 * @since 1.99.0
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 */
 	var DateTimeWithTimezone = CompositeType.extend("sap.ui.model.odata.type.DateTimeWithTimezone",
 		{

package/src/sap/ui/model/odata/type/Decimal.js CHANGED Viewed

@@ -171,7 +171,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @alias sap.ui.model.odata.type.Decimal
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Double.js CHANGED Viewed

@@ -73,7 +73,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @alias sap.ui.model.odata.type.Double
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Guid.js CHANGED Viewed

@@ -62,7 +62,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @alias sap.ui.model.odata.type.Guid
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Int.js CHANGED Viewed

@@ -63,7 +63,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @abstract
 	 * @alias sap.ui.model.odata.type.Int

package/src/sap/ui/model/odata/type/Int16.js CHANGED Viewed

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @alias sap.ui.model.odata.type.Int16
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Int32.js CHANGED Viewed

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @alias sap.ui.model.odata.type.Int32
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Int64.js CHANGED Viewed

@@ -119,7 +119,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @alias sap.ui.model.odata.type.Int64
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/ODataType.js CHANGED Viewed

@@ -116,7 +116,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @abstract
 	 * @alias sap.ui.model.odata.type.ODataType

package/src/sap/ui/model/odata/type/Raw.js CHANGED Viewed

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 */
 	var Raw = ODataType.extend("sap.ui.model.odata.type.Raw", {
 			constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/SByte.js CHANGED Viewed

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @alias sap.ui.model.odata.type.SByte
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Single.js CHANGED Viewed

@@ -73,7 +73,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @alias sap.ui.model.odata.type.Single
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Stream.js CHANGED Viewed

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.51.0
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 */
 	var Stream = ODataType.extend("sap.ui.model.odata.type.Stream", {
 			constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/String.js CHANGED Viewed

@@ -84,7 +84,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @alias sap.ui.model.odata.type.String
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Time.js CHANGED Viewed

@@ -138,7 +138,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @alias sap.ui.model.odata.type.Time
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/TimeOfDay.js CHANGED Viewed

@@ -92,7 +92,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 */
 	var TimeOfDay = ODataType.extend("sap.ui.model.odata.type.TimeOfDay", {
 			constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/Unit.js CHANGED Viewed

@@ -66,7 +66,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.type.Unit
 	 * @public
 	 * @since 1.63.0
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 */
 	var Unit = BaseUnit.extend("sap.ui.model.odata.type.Unit", {
 		constructor : function (oFormatOptions, oConstraints, aDynamicFormatOptionNames) {

package/src/sap/ui/model/odata/v2/Context.js CHANGED Viewed

@@ -64,7 +64,7 @@ sap.ui.define([
 	 * @hideconstructor
 	 * @public
 	 * @since 1.93.0
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 */
 	var Context = BaseContext.extend("sap.ui.model.odata.v2.Context", {
 			constructor : function (oModel, sPath, sDeepPath, oCreatePromise, bInactive,

package/src/sap/ui/model/odata/v2/ODataAnnotations.js CHANGED Viewed

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @class Annotation loader for OData V2 services
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @public
 	 * @since 1.37.0

package/src/sap/ui/model/odata/v2/ODataModel.js CHANGED Viewed

@@ -218,7 +218,7 @@ sap.ui.define([
 	 * This model is not prepared to be inherited from.
 	 *
 	 * @author SAP SE
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.v2.ODataModel

package/src/sap/ui/model/odata/v2/ODataTreeBinding.js CHANGED Viewed

@@ -102,7 +102,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.TreeBinding
 	 * @hideconstructor
 	 * @public
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 */
 	var ODataTreeBinding = TreeBinding.extend("sap.ui.model.odata.v2.ODataTreeBinding", /** @lends sap.ui.model.odata.v2.ODataTreeBinding.prototype */ {

package/src/sap/ui/model/odata/v4/Context.js CHANGED Viewed

@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.39.0
-		 * @version 1.120.18
+		 * @version 1.120.20
 		 */
 		Context = BaseContext.extend("sap.ui.model.odata.v4.Context", {
 				constructor : constructor

package/src/sap/ui/model/odata/v4/ODataContextBinding.js CHANGED Viewed

@@ -74,7 +74,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.120.18
+		 * @version 1.120.20
 		 *
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding

package/src/sap/ui/model/odata/v4/ODataListBinding.js CHANGED Viewed

@@ -57,7 +57,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.120.18
+		 * @version 1.120.20
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getUpdateGroupId as #getUpdateGroupId

package/src/sap/ui/model/odata/v4/ODataMetaModel.js CHANGED Viewed

@@ -156,7 +156,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.120.18
+		 * @version 1.120.20
 		 */
 		ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 				constructor : constructor

package/src/sap/ui/model/odata/v4/ODataModel.js CHANGED Viewed

@@ -234,7 +234,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.Model
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.120.18
+		 * @version 1.120.20
 		 */
 		ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */{
@@ -1450,13 +1450,16 @@ sap.ui.define([
 	 *   the longtext URL
 	 * @param {string} [sCachePath]
 	 *   The cache-relative path to the entity; used to resolve the targets
+	 * @param {object} [oOriginalMessage=oRawMessage]
+	 *   The original message object which is used to create the technical details
 	 * @returns {sap.ui.core.message.Message}
 	 *   The created UI5 message object
 	 *
 	 * @private
 	 */
 	// eslint-disable-next-line valid-jsdoc -- .@$ui5. is not understood properly
-	ODataModel.prototype.createUI5Message = function (oRawMessage, sResourcePath, sCachePath) {
+	ODataModel.prototype.createUI5Message = function (oRawMessage, sResourcePath, sCachePath,
+			oOriginalMessage = oRawMessage) {
 		var bIsBound = typeof oRawMessage.target === "string",
 			sMessageLongtextUrl = oRawMessage.longtextUrl,
 			aTargets,
@@ -1491,7 +1494,7 @@ sap.ui.define([
 			// Note: "" instead of undefined makes filtering easier (agreement with FE!)
 			target : bIsBound ? aTargets : "",
 			technical : oRawMessage.technical,
-			technicalDetails : _Helper.createTechnicalDetails(oRawMessage),
+			technicalDetails : _Helper.createTechnicalDetails(oOriginalMessage),
 			type : aMessageTypes[oRawMessage.numericSeverity] || MessageType.None
 		});
 	};
@@ -2435,24 +2438,49 @@ sap.ui.define([
 	/**
 	 * Reports the given OData transition messages by firing a <code>messageChange</code> event with
-	 * the new messages.
+	 * the new messages. Takes care of adjusting message targets for bound operations' binding
+	 * parameters.
 	 *
 	 * @param {object[]} aMessages
 	 *   An array of messages suitable for {@link #createUI5Message}
 	 * @param {string} [sResourcePath]
-	 *   The resource path of the cache that saw the messages; used to resolve the longtext URL
+	 *   The resource path of the cache that saw the messages; used to resolve the longtext URL and
+	 *   for adjusting a message target in case it is an operation parameter, except the binding
+	 *   parameter
 	 *
 	 * @private
 	 */
 	ODataModel.prototype.reportTransitionMessages = function (aMessages, sResourcePath) {
-		var that = this;
+		var sContextPath, oOperationMetadata;
+		if (!aMessages.length) {
+			return;
+		}
-		if (aMessages && aMessages.length) {
-			Messaging.updateMessages(undefined, aMessages.map(function (oMessage) {
-				oMessage.transition = true;
-				return that.createUI5Message(oMessage, sResourcePath);
-			}));
+		if (sResourcePath) {
+			const oMetaModel = this.getMetaModel();
+			sContextPath = "/" + sResourcePath.split("?")[0]; // remove query string
+			const sMetaPath = _Helper.getMetaPath(sContextPath);
+			const vMetadata = oMetaModel.getObject(sMetaPath);
+			if (Array.isArray(vMetadata)) {
+				// normally, ODCB#_invoke has already checked that there is exactly one overload;
+				// in rare case w/o #invoke, such a check is missing
+				oOperationMetadata = oMetaModel.getObject(sMetaPath + "/@$ui5.overload/0");
+				sContextPath = sContextPath.slice(0, sContextPath.lastIndexOf("/"));
+			}
 		}
+		Messaging.updateMessages(undefined, aMessages.map((oMessage) => {
+			const oOriginalMessage = oMessage;
+			if (oOperationMetadata) {
+				oMessage = _Helper.clone(oMessage);
+				// make targets absolute, will not be adjusted again in #createUI5Message
+				_Helper.adjustTargets(oMessage, oOperationMetadata, undefined, sContextPath);
+			}
+			oMessage.transition = true;
+			return this.createUI5Message(oMessage, sResourcePath, undefined, oOriginalMessage);
+		}));
 	};
 	/**

package/src/sap/ui/model/odata/v4/ODataPropertyBinding.js CHANGED Viewed

@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.120.18
+		 * @version 1.120.20
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getUpdateGroupId as #getUpdateGroupId

package/src/sap/ui/model/odata/v4/lib/_Cache.js CHANGED Viewed

@@ -3992,6 +3992,7 @@ sap.ui.define([
 		var sResourcePath = this.sResourcePath + this.sQueryString,
 			that = this;
+		this.registerChangeListener(sPath, oListener);
 		if (this.oPromise) {
 			oGroupLock.unlock();
 		} else {
@@ -4014,7 +4015,6 @@ sap.ui.define([
 			if (oResult && oResult["$ui5.deleted"]) {
 				throw new Error("Cannot read a deleted entity");
 			}
-			that.registerChangeListener(sPath, oListener);
 			return that.drillDown(oResult, sPath, oGroupLock, bCreateOnDemand);
 		});
 	};

package/src/sap/ui/model/odata/v4/lib/_Helper.js CHANGED Viewed

@@ -163,8 +163,9 @@ sap.ui.define([
 		 * @param {object} oOperationMetadata
 		 *   The operation metadata to determine whether a given message target is a parameter
 		 *   of the operation
-		 * @param {string} sParameterContextPath
-		 *   The parameter context path
+		 * @param {string} [sParameterContextPath]
+		 *   The parameter context path, needed for adjusting a message target in case it is an
+		 *   operation parameter, except the binding parameter
 		 * @param {string} [sContextPath]
 		 *   The context path for a bound operation
 		 *
@@ -172,7 +173,9 @@ sap.ui.define([
 		 */
 		adjustTargets : function (oMessage, oOperationMetadata, sParameterContextPath,
 				sContextPath) {
-			var sAdditionalTargetsKey = _Helper.getAnnotationKey(oMessage, ".additionalTargets"),
+			var sAdditionalTargetsKey = "additionalTargets" in oMessage
+					? "additionalTargets"
+					: _Helper.getAnnotationKey(oMessage, ".additionalTargets"),
 				aTargets;
 			aTargets = [oMessage.target].concat(oMessage[sAdditionalTargetsKey])
@@ -1267,8 +1270,9 @@ sap.ui.define([
 		 * @param {object} oOperationMetadata
 		 *   The operation metadata to determine whether a given message target is a parameter
 		 *   of the operation
-		 * @param {string} sParameterContextPath
-		 *   The parameter context path
+		 * @param {string} [sParameterContextPath]
+		 *   The parameter context path, needed for adjusting a message target in case it is an
+		 *   operation parameter, except the binding parameter
 		 * @param {string} [sContextPath]
 		 *   The context path for a bound operation
 		 * @returns {string|undefined} The adjusted target, or <code>undefined</code> if the target
@@ -1277,7 +1281,7 @@ sap.ui.define([
 		 * @private
 		 */
 		getAdjustedTarget : function (sTarget, oOperationMetadata, sParameterContextPath,
-					sContextPath) {
+				sContextPath) {
 			var bIsParameterName,
 				sParameterName,
 				aSegments;
@@ -1293,6 +1297,9 @@ sap.ui.define([
 				sTarget = _Helper.buildPath(sContextPath, aSegments.join("/"));
 				return sTarget;
 			}
+			if (!sParameterContextPath) {
+				return sTarget;
+			}
 			bIsParameterName = oOperationMetadata.$Parameter.some(function (oParameter) {
 				return sParameterName === oParameter.$Name;
 			});

package/src/sap/ui/model/resource/ResourceModel.js CHANGED Viewed

@@ -227,7 +227,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.120.18
+	 * @version 1.120.20
 	 */
 	var ResourceModel = Model.extend("sap.ui.model.resource.ResourceModel", /** @lends sap.ui.model.resource.ResourceModel.prototype */ {