@sapui5/sap.suite.ui.generic.template 1.108.36 → 1.108.37

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 (8) hide show
  1. package/package.json +1 -1
  2. package/src/sap/suite/ui/generic/template/.library +1 -1
  3. package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartVariantManagementWrapper.js +4 -2
  4. package/src/sap/suite/ui/generic/template/lib/AppComponent.js +1 -1
  5. package/src/sap/suite/ui/generic/template/lib/CRUDHelper.js +5 -3
  6. package/src/sap/suite/ui/generic/template/lib/CommonEventHandlers.js +4 -0
  7. package/src/sap/suite/ui/generic/template/lib/navigation/NavigationController.js +1 -1
  8. package/src/sap/suite/ui/generic/template/library.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sapui5/sap.suite.ui.generic.template",
3
- "version": "1.108.36",
3
+ "version": "1.108.37",
4
4
  "description": "SAPUI5 Library sap.suite.ui.generic.template",
5
5
  "keywords": [
6
6
  "sapui5",
package/src/sap/suite/ui/generic/template/.library CHANGED
@@ -7,7 +7,7 @@
7
7
 
8
8
  (c) Copyright 2009-2015 SAP SE. All rights reserved
9
9
  </copyright>
10
- <version>1.108.36</version>
10
+ <version>1.108.37</version>
11
11
 
12
12
  <documentation>Library with generic Suite UI templates.</documentation>
13
13
 
package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartVariantManagementWrapper.js CHANGED
@@ -105,8 +105,10 @@ sap.ui.define([
105
105
  oControl.attachAfterVariantInitialise(function() {
106
106
  //set currentVariantId only when sVariantId is not standard (as it might be overriding existing
107
107
  //different currentVariantId) or smartTable's (oControl) currentVariantId is not equal to sVariantId.
108
- if (sVariantId !== '*standard*' && oControl.getCurrentVariantId && oControl.getCurrentVariantId() !== sVariantId) {
109
- oControl.setCurrentVariantId(sVariantId);
108
+ if (sVariantId !== '*standard*') {
109
+ if (oControl.getCurrentVariantId && oControl.getCurrentVariantId() !== sVariantId) {
110
+ oControl.setCurrentVariantId(sVariantId);
111
+ }
110
112
  oSmartVariantManagement.setModified(false);
111
113
  }
112
114
  });
package/src/sap/suite/ui/generic/template/lib/AppComponent.js CHANGED
@@ -856,7 +856,7 @@ sap.ui.define([
856
856
  * @extends sap.ui.core.UIComponent
857
857
  * @abstract
858
858
  * @author SAP SE
859
- * @version 1.108.36
859
+ * @version 1.108.37
860
860
  * @name sap.suite.ui.generic.template.lib.AppComponent
861
861
  */
862
862
  return UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {
package/src/sap/suite/ui/generic/template/lib/CRUDHelper.js CHANGED
@@ -212,7 +212,7 @@ sap.ui.define(["sap/ui/base/Object", "sap/ui/model/Context", "sap/suite/ui/gener
212
212
  ]);
213
213
  var sEdit = oResourceObject.getText("Edit");
214
214
  var sCancel = oResourceObject.getText("CANCEL");
215
- MessageBox.warning(sWarningText, {
215
+ MessageBox.warning(sWarningText, {
216
216
  title: oResourceObject.getText("ST_UNSAVED_CHANGES_TITLE"),
217
217
  actions: [sEdit, sCancel],
218
218
  emphasizedAction: sEdit,
@@ -220,7 +220,7 @@ sap.ui.define(["sap/ui/base/Object", "sap/ui/model/Context", "sap/suite/ui/gener
220
220
  if (sAction === sEdit) {
221
221
  resolve();
222
222
  } else if (sAction === sCancel) {
223
- if (bOpenInEditMode) {
223
+ if (bOpenInEditMode && oViewProxy && oViewProxy.navigateUp) {
224
224
  oViewProxy.navigateUp();
225
225
  }
226
226
  }
@@ -356,7 +356,9 @@ sap.ui.define(["sap/ui/base/Object", "sap/ui/model/Context", "sap/suite/ui/gener
356
356
  });
357
357
  oApplication.getBusyHelper().setBusy(oUnsavedChangesEditPromise, true);
358
358
  };
359
- var editRejection = Function.prototype;
359
+ var editRejection = reject({
360
+ cancelled: true
361
+ });
360
362
  var unSavedChangesDialogPromise = fnUnsavedChangesDialog(undefined, oResponse.DraftAdministrativeData,oCommonUtils, oViewProxy, bOpenInEditMode);
361
363
  unSavedChangesDialogPromise.then(editConfirmation,editRejection);
362
364
  }
package/src/sap/suite/ui/generic/template/lib/CommonEventHandlers.js CHANGED
@@ -1532,6 +1532,10 @@ sap.ui.define(["sap/ui/base/Object",
1532
1532
  if (oError.lockedByUser) {
1533
1533
  var sLockText = oCommonUtils.getText("ST_GENERIC_DRAFT_LOCKED_BY_USER", [" ", oError.lockedByUser]);
1534
1534
  MessageBox.error(sLockText);
1535
+ } else if (oError.cancelled) {
1536
+ if (oViewProxy && oViewProxy.navigateUp){
1537
+ oViewProxy.navigateUp();
1538
+ }
1535
1539
  } else {
1536
1540
  MessageUtils.handleError(MessageUtils.operations.editEntity, oController, oServices, oError);
1537
1541
  oViewProxy.navigateUp();
package/src/sap/suite/ui/generic/template/lib/navigation/NavigationController.js CHANGED
@@ -2975,7 +2975,7 @@ sap.ui.define(["sap/ui/base/Object",
2975
2975
  * @param {sap.suite.ui.generic.template.lib.AppComponent} oAppComponent The AppComponent instance
2976
2976
  * @public
2977
2977
  * @extends sap.ui.base.Object
2978
- * @version 1.108.36
2978
+ * @version 1.108.37
2979
2979
  * @since 1.30.0
2980
2980
  * @alias sap.suite.ui.generic.template.lib.NavigationController
2981
2981
  */
package/src/sap/suite/ui/generic/template/library.js CHANGED
@@ -38,7 +38,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/core/library','sap/fe/placeholder/lib
38
38
  interfaces: [],
39
39
  controls: [],
40
40
  elements: [],
41
- version: "1.108.36",
41
+ version: "1.108.37",
42
42
  extensions: {
43
43
  //Configuration used for rule loading of Support Assistant
44
44
  "sap.ui.support": {