diff --git a/src/01/02/01/z2ui5_cl_core_event_srv.clas.abap b/src/01/02/01/z2ui5_cl_core_event_srv.clas.abap index 91de1101..f58badb3 100644 --- a/src/01/02/01/z2ui5_cl_core_event_srv.clas.abap +++ b/src/01/02/01/z2ui5_cl_core_event_srv.clas.abap @@ -7,12 +7,12 @@ CLASS z2ui5_cl_core_event_srv DEFINITION METHODS get_event IMPORTING - !val TYPE clike OPTIONAL - !t_arg TYPE string_table OPTIONAL - !s_cnt TYPE z2ui5_if_types=>ty_s_event_control OPTIONAL + !val TYPE clike OPTIONAL + !t_arg TYPE string_table OPTIONAL + !s_cnt TYPE z2ui5_if_types=>ty_s_event_control OPTIONAL PREFERRED PARAMETER val RETURNING - VALUE(result) TYPE string. + VALUE(result) TYPE string. METHODS get_event_client IMPORTING @@ -39,7 +39,17 @@ CLASS z2ui5_cl_core_event_srv IMPLEMENTATION. result = |{ z2ui5_if_core_types=>cs_ui5-event_backend_function }(['{ val }'|. - IF s_cnt-check_allow_multi_req = abap_true. + IF s_cnt-model_name IS NOT INITIAL. + IF s_cnt-check_allow_multi_req = abap_true. + IF s_cnt-check_view_destroy = abap_true. + result = result && `,true,true, "` && s_cnt-model_name && `"`. + ELSE. + result = result && `,false,true, "` && s_cnt-model_name && `"`. + ENDIF. + ELSE. + result = result && `,false,false, "` && s_cnt-model_name && `"`. + ENDIF. + ELSEIF s_cnt-check_allow_multi_req = abap_true. IF s_cnt-check_view_destroy = abap_true. result = result && `,true,true`. ELSE. diff --git a/src/01/02/z2ui5_cl_core_http_get.clas.abap b/src/01/02/z2ui5_cl_core_http_get.clas.abap index 2c0b596e..76685710 100644 --- a/src/01/02/z2ui5_cl_core_http_get.clas.abap +++ b/src/01/02/z2ui5_cl_core_http_get.clas.abap @@ -317,10 +317,12 @@ CLASS Z2UI5_CL_CORE_HTTP_GET IMPLEMENTATION. ` }` && |\n| && ` sap.z2ui5.isBusy = true;` && |\n| && ` BusyIndicator.show();` && |\n| && -* ` let appStart = sap.z2ui5.oBody.APP_START;` && |\n| && ` sap.z2ui5.oBody = {};` && |\n| && -* ` sap.z2ui5.oBody.APP_START = appStart;` && |\n| && - ` if ( sap.z2ui5.oController == this ) {` && |\n| && + ` if ( args[0][3] ) {` && |\n| && + ` sap.z2ui5.oBody.XX = sap.z2ui5.oView.getModel().getData().XX;` && |\n| && + ` sap.z2ui5.oBody.VIEWNAME = 'MAIN';` && |\n| && + ` }` && |\n| && + ` else if ( sap.z2ui5.oController == this ) {` && |\n| && ` sap.z2ui5.oBody.XX = sap.z2ui5.oView.getModel().getData().XX;` && |\n| && ` sap.z2ui5.oBody.VIEWNAME = 'MAIN';` && |\n| && ` }else if ` && |\n| && diff --git a/src/02/z2ui5_if_types.intf.abap b/src/02/z2ui5_if_types.intf.abap index 4e0385b1..db57d8b8 100644 --- a/src/02/z2ui5_if_types.intf.abap +++ b/src/02/z2ui5_if_types.intf.abap @@ -48,6 +48,7 @@ INTERFACE z2ui5_if_types BEGIN OF ty_s_event_control, check_view_destroy TYPE abap_bool, check_allow_multi_req TYPE abap_bool, + model_name TYPE string, END OF ty_s_event_control. ENDINTERFACE.