Skip to content

Commit 5dbd6ae

Browse files
1 parent 8ba7af2 commit 5dbd6ae

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

src/02/z2ui5.wapa.controller_-view1.controller.js

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -242,12 +242,8 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/XMLView", "sap/ui/
242242
}
243243
break;
244244
case 'SET_ODATA_MODEL':
245-
// sap.ui.require([
246-
// "sap/ui/model/odata/v2/ODataModel"
247-
// ], async (ODataModel) => {
248245
var oModel = new ODataModel({ serviceUrl : args[1] });
249246
z2ui5.oView.setModel( oModel , args[2] );
250-
// });
251247
break;
252248
case 'DOWNLOAD_B64_FILE':
253249
var a = document.createElement("a");
@@ -364,7 +360,7 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/XMLView", "sap/ui/
364360
BusyIndicator.show();
365361
z2ui5.oBody = {};
366362
if (args[0][3] || z2ui5.oController == this ) {
367-
if (z2ui5.oResponse.PARAMS.S_VIEW?.SWITCHDEFAULTMODEL){
363+
if (z2ui5.oResponse.PARAMS.S_VIEW?.SWITCH_DEFAULT_MODEL_PATH){
368364
var oModel = z2ui5.oView.getModel( "http");
369365
}else{
370366
oModel = z2ui5.oView.getModel();
@@ -476,9 +472,8 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/XMLView", "sap/ui/
476472
async displayView(xml, viewModel) {
477473
let oview_model = new JSONModel(viewModel);
478474
var oModel = oview_model;
479-
if (z2ui5.oResponse.PARAMS.S_VIEW?.SWITCHDEFAULTMODEL){
480-
oModel = new ODataModel({ serviceUrl : z2ui5.oResponse.PARAMS.S_VIEW?.SWITCHDEFAULTMODEL });
481-
// oModel = z2ui5.oOwnerComponent.getModel(z2ui5.oResponse.PARAMS.S_VIEW?.SWITCHDEFAULTMODEL);
475+
if (z2ui5.oResponse.PARAMS.S_VIEW?.SWITCH_DEFAULT_MODEL_PATH){
476+
oModel = new ODataModel({ serviceUrl : z2ui5.oResponse.PARAMS.S_VIEW?.SWITCH_DEFAULT_MODEL_PATH });
482477
}
483478
z2ui5.oView = await XMLView.create({
484479
definition: xml,
@@ -494,7 +489,7 @@ sap.ui.define(["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/XMLView", "sap/ui/
494489
}
495490
});
496491
z2ui5.oView.setModel(z2ui5.oDeviceModel, "device");
497-
if (z2ui5.oResponse.PARAMS.S_VIEW?.SWITCHDEFAULTMODEL){
492+
if (z2ui5.oResponse.PARAMS.S_VIEW?.SWITCH_DEFAULT_MODEL_PATH){
498493
z2ui5.oView.setModel(oview_model, "http");
499494
}
500495
z2ui5.oApp.removeAllPages();

0 commit comments

Comments
 (0)