From 667ac8966a91f97a0c07ee5cc87c70b198c9e148 Mon Sep 17 00:00:00 2001 From: Lars Hvam Date: Tue, 21 May 2024 17:46:36 +0200 Subject: [PATCH] bugfix, new pull page: decide package warnings (#6932) --- .../pages/zcl_abapgit_gui_page_pull.clas.abap | 67 ++++++++++++------- 1 file changed, 42 insertions(+), 25 deletions(-) diff --git a/src/ui/pages/zcl_abapgit_gui_page_pull.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_pull.clas.abap index f2ad0601d..3aae92460 100644 --- a/src/ui/pages/zcl_abapgit_gui_page_pull.clas.abap +++ b/src/ui/pages/zcl_abapgit_gui_page_pull.clas.abap @@ -43,22 +43,22 @@ CLASS zcl_abapgit_gui_page_pull DEFINITION PRIVATE SECTION. - DATA mo_repo TYPE REF TO zcl_abapgit_repo. - DATA mi_obj_filter TYPE REF TO zif_abapgit_object_filter. - DATA mo_form_data TYPE REF TO zcl_abapgit_string_map. - DATA ms_checks TYPE zif_abapgit_definitions=>ty_deserialize_checks. - + DATA mo_repo TYPE REF TO zcl_abapgit_repo . + DATA mi_obj_filter TYPE REF TO zif_abapgit_object_filter . + DATA mo_form_data TYPE REF TO zcl_abapgit_string_map . + DATA ms_checks TYPE zif_abapgit_definitions=>ty_deserialize_checks . + METHODS pull + RAISING + zcx_abapgit_exception . METHODS form RETURNING VALUE(ro_form) TYPE REF TO zcl_abapgit_html_form RAISING - zcx_abapgit_exception. - + zcx_abapgit_exception . METHODS choose_transport_request RAISING zcx_abapgit_exception . - ENDCLASS. @@ -163,11 +163,43 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_PULL IMPLEMENTATION. ENDMETHOD. - METHOD zif_abapgit_gui_event_handler~on_event. + METHOD pull. DATA lv_value TYPE string. FIELD-SYMBOLS LIKE LINE OF ms_checks-overwrite. + FIELD-SYMBOLS LIKE LINE OF ms_checks-warning_package. + + + ms_checks-transport-transport = mo_form_data->get( c_id-transport_request ). + + LOOP AT ms_checks-overwrite ASSIGNING . + lv_value = mo_form_data->get( |{ -obj_type }-{ -obj_name }| ). + IF lv_value = 'on'. + -decision = zif_abapgit_definitions=>c_yes. + ELSE. + -decision = zif_abapgit_definitions=>c_no. + ENDIF. + ENDLOOP. + + LOOP AT ms_checks-warning_package ASSIGNING . + lv_value = mo_form_data->get( |{ -obj_type }-{ -obj_name }| ). + IF lv_value = 'on'. + -decision = zif_abapgit_definitions=>c_yes. + ELSE. + -decision = zif_abapgit_definitions=>c_no. + ENDIF. + ENDLOOP. + +* todo, show log? + zcl_abapgit_services_repo=>real_deserialize( + is_checks = ms_checks + io_repo = mo_repo ). + + ENDMETHOD. + + + METHOD zif_abapgit_gui_event_handler~on_event. mo_form_data->merge( ii_event->form_data( ) ). @@ -179,22 +211,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_PULL IMPLEMENTATION. choose_transport_request( ). rs_handled-state = zcl_abapgit_gui=>c_event_state-re_render. WHEN c_action-pull. - ms_checks-transport-transport = mo_form_data->get( c_id-transport_request ). - - LOOP AT ms_checks-overwrite ASSIGNING . - lv_value = mo_form_data->get( |{ -obj_type }-{ -obj_name }| ). - IF lv_value = 'on'. - -decision = zif_abapgit_definitions=>c_yes. - ELSE. - -decision = zif_abapgit_definitions=>c_no. - ENDIF. - ENDLOOP. - -* todo, show log? - zcl_abapgit_services_repo=>real_deserialize( - is_checks = ms_checks - io_repo = mo_repo ). - + pull( ). rs_handled-state = zcl_abapgit_gui=>c_event_state-go_back. ENDCASE.