SAP/abapGit
1
0
Fork 0
mirror of https://github.com/abapGit/abapGit.git synced 2025-05-01 12:20:51 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix cancel in select from list popup #1050

Browse Source
This commit is contained in:
larshp 2018-05-13 08:43:06 +00:00
parent 5a69d26a26
commit bd0a6ff34a
2 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/ui/zcl_abapgit_popups.clas.abap
View File

@ -132,6 +132,7 @@ CLASS zcl_abapgit_popups DEFINITION
EXPORTING EXPORTING
VALUE(et_list) TYPE STANDARD TABLE VALUE(et_list) TYPE STANDARD TABLE
RAISING RAISING
zcx_abapgit_cancel
zcx_abapgit_exception . zcx_abapgit_exception .
CLASS-METHODS branch_popup_callback CLASS-METHODS branch_popup_callback
IMPORTING IMPORTING
@ -166,6 +167,7 @@ CLASS zcl_abapgit_popups DEFINITION
CONSTANTS c_fieldname_selected TYPE lvc_fname VALUE `SELECTED` ##NO_TEXT. CONSTANTS c_fieldname_selected TYPE lvc_fname VALUE `SELECTED` ##NO_TEXT.
CLASS-DATA go_select_list_popup TYPE REF TO cl_salv_table . CLASS-DATA go_select_list_popup TYPE REF TO cl_salv_table .
CLASS-DATA gr_table TYPE REF TO data . CLASS-DATA gr_table TYPE REF TO data .
CLASS-DATA gv_cancel TYPE abap_bool .
CLASS-DATA go_table_descr TYPE REF TO cl_abap_tabledescr . CLASS-DATA go_table_descr TYPE REF TO cl_abap_tabledescr .
CLASS-METHODS add_field CLASS-METHODS add_field
@ -204,7 +206,7 @@ ENDCLASS.
CLASS zcl_abapgit_popups IMPLEMENTATION. CLASS ZCL_ABAPGIT_POPUPS IMPLEMENTATION.
METHOD add_field. METHOD add_field.
@ -601,11 +603,13 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
CASE e_salv_function. CASE e_salv_function.
WHEN 'O.K.'. WHEN 'O.K.'.
gv_cancel = abap_false.
go_select_list_popup->close_screen( ). go_select_list_popup->close_screen( ).
WHEN 'ABR'. WHEN 'ABR'.
"Canceled: clear list to overwrite nothing "Canceled: clear list to overwrite nothing
CLEAR <lt_table>. CLEAR <lt_table>.
gv_cancel = abap_true.
go_select_list_popup->close_screen( ). go_select_list_popup->close_screen( ).
WHEN 'SALL'. WHEN 'SALL'.
@ -1049,9 +1053,13 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
go_select_list_popup->display( ). go_select_list_popup->display( ).
CATCH cx_salv_msg. CATCH cx_salv_msg.
zcx_abapgit_exception=>raise( 'Error from POPUP_SELECT_OBJ_OVERWRITE' ). zcx_abapgit_exception=>raise( 'Error from POPUP_TO_SELECT_FROM_LIST' ).
ENDTRY. ENDTRY.
IF gv_cancel = abap_true.
RAISE EXCEPTION TYPE zcx_abapgit_cancel.
ENDIF.
get_selected_rows( get_selected_rows(
IMPORTING IMPORTING
et_list = et_list ). et_list = et_list ).
@ -1083,6 +1091,34 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
ENDMETHOD. ENDMETHOD.
METHOD popup_transport_request.
DATA: lt_e071 TYPE STANDARD TABLE OF e071,
lt_e071k TYPE STANDARD TABLE OF e071k.
CALL FUNCTION 'TRINT_ORDER_CHOICE'
IMPORTING
we_order = rv_transport
TABLES
wt_e071 = lt_e071
wt_e071k = lt_e071k
EXCEPTIONS
no_correction_selected = 1
display_mode = 2
object_append_error = 3
recursive_call = 4
wrong_order_type = 5
OTHERS = 6.
IF sy-subrc = 1.
RAISE EXCEPTION TYPE zcx_abapgit_cancel.
ELSEIF sy-subrc > 1.
zcx_abapgit_exception=>raise( |Error from TRINT_ORDER_CHOICE { sy-subrc }| ).
ENDIF.
ENDMETHOD.
METHOD repo_new_offline. METHOD repo_new_offline.
DATA: lv_returncode TYPE c, DATA: lv_returncode TYPE c,
@ -1436,32 +1472,4 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
ENDIF. ENDIF.
ENDMETHOD. ENDMETHOD.
METHOD popup_transport_request.
DATA: lt_e071 TYPE STANDARD TABLE OF e071,
lt_e071k TYPE STANDARD TABLE OF e071k.
CALL FUNCTION 'TRINT_ORDER_CHOICE'
IMPORTING
we_order = rv_transport
TABLES
wt_e071 = lt_e071
wt_e071k = lt_e071k
EXCEPTIONS
no_correction_selected = 1
display_mode = 2
object_append_error = 3
recursive_call = 4
wrong_order_type = 5
OTHERS = 6.
IF sy-subrc = 1.
RAISE EXCEPTION TYPE zcx_abapgit_cancel.
ELSEIF sy-subrc > 1.
zcx_abapgit_exception=>raise( |Error from TRINT_ORDER_CHOICE { sy-subrc }| ).
ENDIF.
ENDMETHOD.
ENDCLASS. ENDCLASS.

4
src/ui/zcl_abapgit_services_repo.clas.abap
View File

@ -85,7 +85,8 @@ CLASS zcl_abapgit_services_repo DEFINITION
CHANGING CHANGING
!ct_overwrite TYPE zif_abapgit_definitions=>ty_overwrite_tt !ct_overwrite TYPE zif_abapgit_definitions=>ty_overwrite_tt
RAISING RAISING
zcx_abapgit_exception . zcx_abapgit_exception
zcx_abapgit_cancel .
CLASS-METHODS popup_package_overwrite CLASS-METHODS popup_package_overwrite
CHANGING CHANGING
!ct_overwrite TYPE zif_abapgit_definitions=>ty_overwrite_tt !ct_overwrite TYPE zif_abapgit_definitions=>ty_overwrite_tt
@ -220,7 +221,6 @@ CLASS ZCL_ABAPGIT_SERVICES_REPO IMPLEMENTATION.
it_columns_to_display = lt_columns it_columns_to_display = lt_columns
IMPORTING IMPORTING
et_list = lt_selected ). et_list = lt_selected ).
* todo, it should be possible for the user to click cancel in the popup
LOOP AT ct_overwrite ASSIGNING <ls_overwrite>. LOOP AT ct_overwrite ASSIGNING <ls_overwrite>.
READ TABLE lt_selected WITH KEY READ TABLE lt_selected WITH KEY