mirror of
https://github.com/abapGit/abapGit.git
synced 2025-05-02 13:03:01 +08:00
* hide current branch and HEAD in delete popup * refactoring and cleanup * hide also HEAD symref * throw branch delete refused
This commit is contained in:
parent
875a9ea227
commit
246b943b87
|
@ -224,6 +224,8 @@ CLASS zcl_abapgit_git_transport IMPLEMENTATION.
|
||||||
zcx_abapgit_exception=>raise( 'failed to update ref' ).
|
zcx_abapgit_exception=>raise( 'failed to update ref' ).
|
||||||
ELSEIF lv_string CP '*missing necessary objects*'.
|
ELSEIF lv_string CP '*missing necessary objects*'.
|
||||||
zcx_abapgit_exception=>raise( 'missing necessary objects' ).
|
zcx_abapgit_exception=>raise( 'missing necessary objects' ).
|
||||||
|
ELSEIF lv_string CP '*refusing to delete the current branch*'.
|
||||||
|
zcx_abapgit_exception=>raise( 'branch delete not allowed' ).
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
|
||||||
ENDMETHOD.
|
ENDMETHOD.
|
||||||
|
|
|
@ -32,6 +32,7 @@ CLASS zcl_abapgit_popups DEFINITION
|
||||||
ty_sval_tt TYPE STANDARD TABLE OF sval WITH DEFAULT KEY.
|
ty_sval_tt TYPE STANDARD TABLE OF sval WITH DEFAULT KEY.
|
||||||
|
|
||||||
CONSTANTS c_fieldname_selected TYPE lvc_fname VALUE `SELECTED` ##NO_TEXT.
|
CONSTANTS c_fieldname_selected TYPE lvc_fname VALUE `SELECTED` ##NO_TEXT.
|
||||||
|
CONSTANTS c_answer_cancel TYPE char1 VALUE 'A' ##NO_TEXT.
|
||||||
|
|
||||||
DATA go_select_list_popup TYPE REF TO cl_salv_table .
|
DATA go_select_list_popup TYPE REF TO cl_salv_table .
|
||||||
DATA gr_table TYPE REF TO data .
|
DATA gr_table TYPE REF TO data .
|
||||||
|
@ -70,6 +71,16 @@ CLASS zcl_abapgit_popups DEFINITION
|
||||||
ev_url TYPE abaptxt255-line
|
ev_url TYPE abaptxt255-line
|
||||||
ev_package TYPE tdevc-devclass
|
ev_package TYPE tdevc-devclass
|
||||||
ev_branch TYPE textl-line .
|
ev_branch TYPE textl-line .
|
||||||
|
TYPES:
|
||||||
|
ty_lt_fields TYPE STANDARD TABLE OF sval WITH DEFAULT KEY.
|
||||||
|
METHODS _popup_2_get_values
|
||||||
|
IMPORTING iv_popup_title TYPE string
|
||||||
|
iv_no_value_check TYPE abap_bool DEFAULT abap_false
|
||||||
|
EXPORTING ev_value_1 TYPE spo_value
|
||||||
|
ev_value_2 TYPE spo_value
|
||||||
|
CHANGING ct_fields TYPE ty_lt_fields
|
||||||
|
RAISING zcx_abapgit_exception
|
||||||
|
zcx_abapgit_cancel.
|
||||||
|
|
||||||
ENDCLASS.
|
ENDCLASS.
|
||||||
|
|
||||||
|
@ -111,6 +122,19 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
|
||||||
lv_head_suffix = | ({ zif_abapgit_definitions=>c_head_name })|.
|
lv_head_suffix = | ({ zif_abapgit_definitions=>c_head_name })|.
|
||||||
lv_head_symref = lo_branches->get_head_symref( ).
|
lv_head_symref = lo_branches->get_head_symref( ).
|
||||||
|
|
||||||
|
IF iv_hide_branch IS NOT INITIAL.
|
||||||
|
DELETE lt_branches WHERE name = iv_hide_branch.
|
||||||
|
ENDIF.
|
||||||
|
|
||||||
|
IF iv_hide_head IS NOT INITIAL.
|
||||||
|
DELETE lt_branches WHERE name = zif_abapgit_definitions=>c_head_name
|
||||||
|
OR is_head = abap_true.
|
||||||
|
ENDIF.
|
||||||
|
|
||||||
|
IF lt_branches IS INITIAL.
|
||||||
|
zcx_abapgit_exception=>raise( 'No branch to select' ).
|
||||||
|
ENDIF.
|
||||||
|
|
||||||
LOOP AT lt_branches ASSIGNING <ls_branch>.
|
LOOP AT lt_branches ASSIGNING <ls_branch>.
|
||||||
|
|
||||||
CHECK <ls_branch>-name IS NOT INITIAL. " To ensure some below ifs
|
CHECK <ls_branch>-name IS NOT INITIAL. " To ensure some below ifs
|
||||||
|
@ -155,25 +179,22 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
|
||||||
|
|
||||||
CALL FUNCTION 'POPUP_TO_DECIDE_LIST'
|
CALL FUNCTION 'POPUP_TO_DECIDE_LIST'
|
||||||
EXPORTING
|
EXPORTING
|
||||||
textline1 = 'Select branch'
|
textline1 = 'Select branch'
|
||||||
titel = 'Select branch'
|
titel = 'Select branch'
|
||||||
start_col = 30
|
start_col = 30
|
||||||
start_row = 5
|
start_row = 5
|
||||||
cursorline = lv_default
|
cursorline = lv_default
|
||||||
IMPORTING
|
IMPORTING
|
||||||
answer = lv_answer
|
answer = lv_answer
|
||||||
TABLES
|
TABLES
|
||||||
t_spopli = lt_selection
|
t_spopli = lt_selection
|
||||||
EXCEPTIONS
|
EXCEPTIONS
|
||||||
not_enough_answers = 1
|
OTHERS = 1. "#EC NOTEXT
|
||||||
too_much_answers = 2
|
|
||||||
too_much_marks = 3
|
|
||||||
OTHERS = 4. "#EC NOTEXT
|
|
||||||
IF sy-subrc <> 0.
|
IF sy-subrc <> 0.
|
||||||
zcx_abapgit_exception=>raise( 'Error from POPUP_TO_DECIDE_LIST' ).
|
zcx_abapgit_exception=>raise( 'Error from POPUP_TO_DECIDE_LIST' ).
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
|
||||||
IF lv_answer = 'A'. " cancel
|
IF lv_answer = c_answer_cancel.
|
||||||
RETURN.
|
RETURN.
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
|
||||||
|
@ -256,11 +277,8 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
|
||||||
|
|
||||||
METHOD zif_abapgit_popups~create_branch_popup.
|
METHOD zif_abapgit_popups~create_branch_popup.
|
||||||
|
|
||||||
DATA: lv_answer TYPE c LENGTH 1,
|
DATA: lt_fields TYPE TABLE OF sval.
|
||||||
lt_fields TYPE TABLE OF sval.
|
DATA: lv_name TYPE spo_value.
|
||||||
|
|
||||||
FIELD-SYMBOLS: <ls_field> LIKE LINE OF lt_fields.
|
|
||||||
|
|
||||||
|
|
||||||
CLEAR: ev_name, ev_cancel.
|
CLEAR: ev_name, ev_cancel.
|
||||||
|
|
||||||
|
@ -268,30 +286,20 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
|
||||||
iv_fieldname = 'LINE'
|
iv_fieldname = 'LINE'
|
||||||
iv_fieldtext = 'Name'
|
iv_fieldtext = 'Name'
|
||||||
iv_value = 'new-branch-name'
|
iv_value = 'new-branch-name'
|
||||||
CHANGING ct_fields = lt_fields ).
|
CHANGING ct_fields = lt_fields ).
|
||||||
|
|
||||||
CALL FUNCTION 'POPUP_GET_VALUES'
|
TRY.
|
||||||
EXPORTING
|
|
||||||
popup_title = 'Create branch'
|
|
||||||
IMPORTING
|
|
||||||
returncode = lv_answer
|
|
||||||
TABLES
|
|
||||||
fields = lt_fields
|
|
||||||
EXCEPTIONS
|
|
||||||
error_in_fields = 1
|
|
||||||
OTHERS = 2 ##NO_TEXT.
|
|
||||||
IF sy-subrc <> 0.
|
|
||||||
zcx_abapgit_exception=>raise( 'error from POPUP_GET_VALUES' ).
|
|
||||||
ENDIF.
|
|
||||||
|
|
||||||
IF lv_answer = 'A'.
|
_popup_2_get_values( EXPORTING iv_popup_title = 'Create branch' "#EC NOTEXT
|
||||||
ev_cancel = abap_true.
|
IMPORTING ev_value_1 = lv_name
|
||||||
ELSE.
|
CHANGING ct_fields = lt_fields ).
|
||||||
READ TABLE lt_fields INDEX 1 ASSIGNING <ls_field>.
|
|
||||||
ASSERT sy-subrc = 0.
|
ev_name = zcl_abapgit_git_branch_list=>complete_heads_branch_name(
|
||||||
ev_name = zcl_abapgit_git_branch_list=>complete_heads_branch_name(
|
zcl_abapgit_git_branch_list=>normalize_branch_name( lv_name ) ).
|
||||||
zcl_abapgit_git_branch_list=>normalize_branch_name( <ls_field>-value ) ).
|
|
||||||
ENDIF.
|
CATCH zcx_abapgit_cancel.
|
||||||
|
ev_cancel = abap_true.
|
||||||
|
ENDTRY.
|
||||||
|
|
||||||
ENDMETHOD.
|
ENDMETHOD.
|
||||||
|
|
||||||
|
@ -516,52 +524,39 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
|
||||||
|
|
||||||
METHOD zif_abapgit_popups~popup_folder_logic.
|
METHOD zif_abapgit_popups~popup_folder_logic.
|
||||||
|
|
||||||
DATA: lv_returncode TYPE c,
|
DATA: lt_fields TYPE TABLE OF sval.
|
||||||
lt_fields TYPE TABLE OF sval.
|
DATA: lv_folder_logic TYPE spo_value.
|
||||||
|
|
||||||
FIELD-SYMBOLS: <ls_field> LIKE LINE OF lt_fields.
|
|
||||||
|
|
||||||
|
CLEAR: rv_folder_logic.
|
||||||
|
|
||||||
add_field( EXPORTING iv_tabname = 'TDEVC'
|
add_field( EXPORTING iv_tabname = 'TDEVC'
|
||||||
iv_fieldname = 'INTSYS'
|
iv_fieldname = 'INTSYS'
|
||||||
iv_fieldtext = 'Folder logic'
|
iv_fieldtext = 'Folder logic'
|
||||||
iv_value = 'PREFIX'
|
iv_value = 'PREFIX'
|
||||||
CHANGING ct_fields = lt_fields ).
|
CHANGING ct_fields = lt_fields ).
|
||||||
|
|
||||||
CALL FUNCTION 'POPUP_GET_VALUES'
|
TRY.
|
||||||
EXPORTING
|
|
||||||
no_value_check = abap_true
|
|
||||||
popup_title = 'Export package' "#EC NOTEXT
|
|
||||||
IMPORTING
|
|
||||||
returncode = lv_returncode
|
|
||||||
TABLES
|
|
||||||
fields = lt_fields
|
|
||||||
EXCEPTIONS
|
|
||||||
error_in_fields = 1
|
|
||||||
OTHERS = 2.
|
|
||||||
IF sy-subrc <> 0.
|
|
||||||
zcx_abapgit_exception=>raise( 'Error from POPUP_GET_VALUES' ).
|
|
||||||
ENDIF.
|
|
||||||
|
|
||||||
IF lv_returncode = 'A'.
|
_popup_2_get_values( EXPORTING iv_popup_title = 'Export package' "#EC NOTEXT
|
||||||
RETURN.
|
iv_no_value_check = abap_true
|
||||||
ENDIF.
|
IMPORTING ev_value_1 = lv_folder_logic
|
||||||
|
CHANGING ct_fields = lt_fields ).
|
||||||
|
|
||||||
READ TABLE lt_fields INDEX 1 ASSIGNING <ls_field>.
|
rv_folder_logic = to_upper( lv_folder_logic ).
|
||||||
ASSERT sy-subrc = 0.
|
|
||||||
TRANSLATE <ls_field>-value TO UPPER CASE.
|
|
||||||
rv_folder_logic = <ls_field>-value.
|
|
||||||
|
|
||||||
ENDMETHOD. "popup_package_export
|
CATCH zcx_abapgit_cancel.
|
||||||
|
ENDTRY.
|
||||||
|
|
||||||
|
ENDMETHOD.
|
||||||
|
|
||||||
|
|
||||||
METHOD zif_abapgit_popups~popup_object.
|
METHOD zif_abapgit_popups~popup_object.
|
||||||
|
|
||||||
DATA: lv_returncode TYPE c,
|
DATA: lt_fields TYPE TABLE OF sval.
|
||||||
lt_fields TYPE TABLE OF sval.
|
DATA: lv_object_type TYPE spo_value.
|
||||||
|
DATA: lv_object_name TYPE spo_value.
|
||||||
FIELD-SYMBOLS: <ls_field> LIKE LINE OF lt_fields.
|
|
||||||
|
|
||||||
|
CLEAR: rs_tadir-object, rs_tadir-obj_name.
|
||||||
|
|
||||||
add_field( EXPORTING iv_tabname = 'TADIR'
|
add_field( EXPORTING iv_tabname = 'TADIR'
|
||||||
iv_fieldname = 'OBJECT'
|
iv_fieldname = 'OBJECT'
|
||||||
|
@ -573,91 +568,56 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
|
||||||
iv_fieldtext = 'Name'
|
iv_fieldtext = 'Name'
|
||||||
CHANGING ct_fields = lt_fields ).
|
CHANGING ct_fields = lt_fields ).
|
||||||
|
|
||||||
CALL FUNCTION 'POPUP_GET_VALUES'
|
TRY.
|
||||||
EXPORTING
|
|
||||||
no_value_check = abap_true
|
|
||||||
popup_title = 'Object' "#EC NOTEXT
|
|
||||||
IMPORTING
|
|
||||||
returncode = lv_returncode
|
|
||||||
TABLES
|
|
||||||
fields = lt_fields
|
|
||||||
EXCEPTIONS
|
|
||||||
error_in_fields = 1
|
|
||||||
OTHERS = 2.
|
|
||||||
IF sy-subrc <> 0.
|
|
||||||
zcx_abapgit_exception=>raise( 'Error from POPUP_GET_VALUES' ).
|
|
||||||
ENDIF.
|
|
||||||
|
|
||||||
IF lv_returncode = 'A'.
|
_popup_2_get_values( EXPORTING iv_popup_title = 'Object' "#EC NOTEXT
|
||||||
RETURN.
|
iv_no_value_check = abap_true
|
||||||
ENDIF.
|
IMPORTING ev_value_1 = lv_object_type
|
||||||
|
ev_value_2 = lv_object_name
|
||||||
|
CHANGING ct_fields = lt_fields ).
|
||||||
|
|
||||||
READ TABLE lt_fields INDEX 1 ASSIGNING <ls_field>.
|
rs_tadir = zcl_abapgit_factory=>get_tadir( )->read_single(
|
||||||
ASSERT sy-subrc = 0.
|
iv_object = to_upper( lv_object_type )
|
||||||
TRANSLATE <ls_field>-value TO UPPER CASE.
|
iv_obj_name = to_upper( lv_object_name ) ).
|
||||||
rs_tadir-object = <ls_field>-value.
|
|
||||||
|
|
||||||
READ TABLE lt_fields INDEX 2 ASSIGNING <ls_field>.
|
CATCH zcx_abapgit_cancel.
|
||||||
ASSERT sy-subrc = 0.
|
ENDTRY.
|
||||||
TRANSLATE <ls_field>-value TO UPPER CASE.
|
|
||||||
rs_tadir-obj_name = <ls_field>-value.
|
|
||||||
|
|
||||||
rs_tadir = zcl_abapgit_factory=>get_tadir( )->read_single(
|
|
||||||
iv_object = rs_tadir-object
|
|
||||||
iv_obj_name = rs_tadir-obj_name ).
|
|
||||||
|
|
||||||
ENDMETHOD.
|
ENDMETHOD.
|
||||||
|
|
||||||
|
|
||||||
METHOD zif_abapgit_popups~popup_package_export.
|
METHOD zif_abapgit_popups~popup_package_export.
|
||||||
|
|
||||||
DATA: lv_returncode TYPE c,
|
DATA: lt_fields TYPE TABLE OF sval.
|
||||||
lt_fields TYPE TABLE OF sval.
|
DATA: lv_package TYPE spo_value.
|
||||||
|
DATA: lv_folder_logic TYPE spo_value.
|
||||||
FIELD-SYMBOLS: <ls_field> LIKE LINE OF lt_fields.
|
|
||||||
|
|
||||||
|
|
||||||
add_field( EXPORTING iv_tabname = 'TDEVC'
|
add_field( EXPORTING iv_tabname = 'TDEVC'
|
||||||
iv_fieldname = 'DEVCLASS'
|
iv_fieldname = 'DEVCLASS'
|
||||||
iv_fieldtext = 'Package'
|
iv_fieldtext = 'Package'
|
||||||
CHANGING ct_fields = lt_fields ).
|
CHANGING ct_fields = lt_fields ).
|
||||||
|
|
||||||
add_field( EXPORTING iv_tabname = 'TDEVC'
|
add_field( EXPORTING iv_tabname = 'TDEVC'
|
||||||
iv_fieldname = 'INTSYS'
|
iv_fieldname = 'INTSYS'
|
||||||
iv_fieldtext = 'Folder logic'
|
iv_fieldtext = 'Folder logic'
|
||||||
iv_value = 'PREFIX'
|
iv_value = 'PREFIX'
|
||||||
CHANGING ct_fields = lt_fields ).
|
CHANGING ct_fields = lt_fields ).
|
||||||
|
|
||||||
CALL FUNCTION 'POPUP_GET_VALUES'
|
TRY.
|
||||||
EXPORTING
|
|
||||||
no_value_check = abap_true
|
|
||||||
popup_title = 'Export package' "#EC NOTEXT
|
|
||||||
IMPORTING
|
|
||||||
returncode = lv_returncode
|
|
||||||
TABLES
|
|
||||||
fields = lt_fields
|
|
||||||
EXCEPTIONS
|
|
||||||
error_in_fields = 1
|
|
||||||
OTHERS = 2.
|
|
||||||
IF sy-subrc <> 0.
|
|
||||||
zcx_abapgit_exception=>raise( 'Error from POPUP_GET_VALUES' ).
|
|
||||||
ENDIF.
|
|
||||||
|
|
||||||
IF lv_returncode = 'A'.
|
_popup_2_get_values( EXPORTING iv_popup_title = 'Export package' "#EC NOTEXT
|
||||||
RETURN.
|
iv_no_value_check = abap_true
|
||||||
ENDIF.
|
IMPORTING ev_value_1 = lv_package
|
||||||
|
ev_value_2 = lv_folder_logic
|
||||||
|
CHANGING ct_fields = lt_fields ).
|
||||||
|
|
||||||
READ TABLE lt_fields INDEX 1 ASSIGNING <ls_field>.
|
ev_package = to_upper( lv_package ).
|
||||||
ASSERT sy-subrc = 0.
|
ev_folder_logic = to_upper( lv_folder_logic ).
|
||||||
TRANSLATE <ls_field>-value TO UPPER CASE.
|
|
||||||
ev_package = <ls_field>-value.
|
|
||||||
|
|
||||||
READ TABLE lt_fields INDEX 2 ASSIGNING <ls_field>.
|
CATCH zcx_abapgit_cancel.
|
||||||
ASSERT sy-subrc = 0.
|
ENDTRY.
|
||||||
TRANSLATE <ls_field>-value TO UPPER CASE.
|
|
||||||
ev_folder_logic = <ls_field>-value.
|
|
||||||
|
|
||||||
ENDMETHOD. "popup_package_export
|
ENDMETHOD.
|
||||||
|
|
||||||
|
|
||||||
METHOD zif_abapgit_popups~popup_to_confirm.
|
METHOD zif_abapgit_popups~popup_to_confirm.
|
||||||
|
@ -712,12 +672,13 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
|
||||||
|
|
||||||
|
|
||||||
METHOD zif_abapgit_popups~popup_to_create_transp_branch.
|
METHOD zif_abapgit_popups~popup_to_create_transp_branch.
|
||||||
DATA: lv_returncode TYPE c,
|
DATA: lt_fields TYPE TABLE OF sval,
|
||||||
lt_fields TYPE TABLE OF sval,
|
|
||||||
lv_transports_as_text TYPE string,
|
lv_transports_as_text TYPE string,
|
||||||
ls_transport_header LIKE LINE OF it_transport_headers.
|
ls_transport_header LIKE LINE OF it_transport_headers.
|
||||||
|
DATA: lv_branch_name TYPE spo_value.
|
||||||
|
DATA: lv_commit_text TYPE spo_value.
|
||||||
|
|
||||||
FIELD-SYMBOLS: <ls_field> LIKE LINE OF lt_fields.
|
CLEAR: rs_transport_branch-branch_name, rs_transport_branch-commit_text.
|
||||||
|
|
||||||
lv_transports_as_text = 'Transport(s)'.
|
lv_transports_as_text = 'Transport(s)'.
|
||||||
LOOP AT it_transport_headers INTO ls_transport_header.
|
LOOP AT it_transport_headers INTO ls_transport_header.
|
||||||
|
@ -736,31 +697,14 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
|
||||||
iv_value = lv_transports_as_text
|
iv_value = lv_transports_as_text
|
||||||
CHANGING ct_fields = lt_fields ).
|
CHANGING ct_fields = lt_fields ).
|
||||||
|
|
||||||
CALL FUNCTION 'POPUP_GET_VALUES'
|
_popup_2_get_values( EXPORTING iv_popup_title = 'Transport to new Branch' "#EC NOTEXT
|
||||||
EXPORTING
|
IMPORTING ev_value_1 = lv_branch_name
|
||||||
popup_title = 'Transport to new Branch'
|
ev_value_2 = lv_commit_text
|
||||||
IMPORTING
|
CHANGING ct_fields = lt_fields ).
|
||||||
returncode = lv_returncode
|
|
||||||
TABLES
|
|
||||||
fields = lt_fields
|
|
||||||
EXCEPTIONS
|
|
||||||
error_in_fields = 1
|
|
||||||
OTHERS = 2.
|
|
||||||
IF sy-subrc <> 0.
|
|
||||||
zcx_abapgit_exception=>raise( 'Error from POPUP_GET_VALUES' ).
|
|
||||||
ENDIF.
|
|
||||||
|
|
||||||
IF lv_returncode = 'A'.
|
rs_transport_branch-branch_name = lv_branch_name.
|
||||||
RAISE EXCEPTION TYPE zcx_abapgit_cancel.
|
rs_transport_branch-commit_text = lv_commit_text.
|
||||||
ENDIF.
|
|
||||||
|
|
||||||
READ TABLE lt_fields INDEX 1 ASSIGNING <ls_field>.
|
|
||||||
ASSERT sy-subrc = 0.
|
|
||||||
rs_transport_branch-branch_name = <ls_field>-value.
|
|
||||||
|
|
||||||
READ TABLE lt_fields INDEX 2 ASSIGNING <ls_field>.
|
|
||||||
ASSERT sy-subrc = 0.
|
|
||||||
rs_transport_branch-commit_text = <ls_field>-value.
|
|
||||||
ENDMETHOD.
|
ENDMETHOD.
|
||||||
|
|
||||||
|
|
||||||
|
@ -974,7 +918,7 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
|
||||||
zcx_abapgit_exception=>raise( 'Error from POPUP_GET_VALUES' ).
|
zcx_abapgit_exception=>raise( 'Error from POPUP_GET_VALUES' ).
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
|
||||||
IF lv_returncode = 'A'.
|
IF lv_returncode = c_answer_cancel.
|
||||||
rs_popup-cancel = abap_true.
|
rs_popup-cancel = abap_true.
|
||||||
RETURN.
|
RETURN.
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
@ -1088,7 +1032,7 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
|
||||||
zcx_abapgit_exception=>raise( 'Error from POPUP_GET_VALUES' ).
|
zcx_abapgit_exception=>raise( 'Error from POPUP_GET_VALUES' ).
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
|
||||||
IF lv_returncode = 'A'.
|
IF lv_returncode = c_answer_cancel.
|
||||||
rs_popup-cancel = abap_true.
|
rs_popup-cancel = abap_true.
|
||||||
RETURN.
|
RETURN.
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
@ -1125,11 +1069,8 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
|
||||||
|
|
||||||
METHOD zif_abapgit_popups~run_page_class_popup.
|
METHOD zif_abapgit_popups~run_page_class_popup.
|
||||||
|
|
||||||
DATA: lv_answer TYPE c LENGTH 1,
|
DATA: lt_fields TYPE TABLE OF sval.
|
||||||
lt_fields TYPE TABLE OF sval.
|
DATA: lv_name TYPE spo_value.
|
||||||
|
|
||||||
FIELD-SYMBOLS: <ls_field> LIKE LINE OF lt_fields.
|
|
||||||
|
|
||||||
|
|
||||||
CLEAR: ev_name, ev_cancel.
|
CLEAR: ev_name, ev_cancel.
|
||||||
|
|
||||||
|
@ -1137,30 +1078,58 @@ CLASS zcl_abapgit_popups IMPLEMENTATION.
|
||||||
iv_fieldname = 'LINE'
|
iv_fieldname = 'LINE'
|
||||||
iv_fieldtext = 'Name'
|
iv_fieldtext = 'Name'
|
||||||
iv_value = 'lcl_gui_page_'
|
iv_value = 'lcl_gui_page_'
|
||||||
CHANGING ct_fields = lt_fields ).
|
CHANGING ct_fields = lt_fields ).
|
||||||
|
|
||||||
|
TRY.
|
||||||
|
|
||||||
|
_popup_2_get_values( EXPORTING iv_popup_title = 'Run page manually' "#EC NOTEXT
|
||||||
|
IMPORTING ev_value_1 = lv_name
|
||||||
|
CHANGING ct_fields = lt_fields ).
|
||||||
|
|
||||||
|
ev_name = to_upper( lv_name ).
|
||||||
|
|
||||||
|
CATCH zcx_abapgit_cancel.
|
||||||
|
ev_cancel = abap_true.
|
||||||
|
ENDTRY.
|
||||||
|
|
||||||
|
ENDMETHOD.
|
||||||
|
|
||||||
|
|
||||||
|
METHOD _popup_2_get_values.
|
||||||
|
|
||||||
|
DATA lv_answer TYPE char1.
|
||||||
|
FIELD-SYMBOLS: <ls_field> TYPE sval.
|
||||||
|
|
||||||
CALL FUNCTION 'POPUP_GET_VALUES'
|
CALL FUNCTION 'POPUP_GET_VALUES'
|
||||||
EXPORTING
|
EXPORTING
|
||||||
popup_title = 'Run page manually'
|
no_value_check = iv_no_value_check
|
||||||
|
popup_title = iv_popup_title
|
||||||
IMPORTING
|
IMPORTING
|
||||||
returncode = lv_answer
|
returncode = lv_answer
|
||||||
TABLES
|
TABLES
|
||||||
fields = lt_fields
|
fields = ct_fields
|
||||||
EXCEPTIONS
|
EXCEPTIONS
|
||||||
error_in_fields = 1
|
OTHERS = 1 ##NO_TEXT.
|
||||||
OTHERS = 2 ##NO_TEXT.
|
|
||||||
IF sy-subrc <> 0.
|
IF sy-subrc <> 0.
|
||||||
zcx_abapgit_exception=>raise( 'error from POPUP_GET_VALUES' ).
|
zcx_abapgit_exception=>raise( 'error from POPUP_GET_VALUES' ).
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
|
||||||
IF lv_answer = 'A'.
|
IF lv_answer = c_answer_cancel.
|
||||||
ev_cancel = abap_true.
|
RAISE EXCEPTION TYPE zcx_abapgit_cancel.
|
||||||
ELSE.
|
|
||||||
READ TABLE lt_fields INDEX 1 ASSIGNING <ls_field>.
|
|
||||||
ASSERT sy-subrc = 0.
|
|
||||||
ev_name = to_upper( <ls_field>-value ).
|
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
|
||||||
ENDMETHOD. "run_page_class_popup
|
IF ev_value_1 IS REQUESTED.
|
||||||
|
READ TABLE ct_fields INDEX 1 ASSIGNING <ls_field>.
|
||||||
|
ASSERT sy-subrc = 0.
|
||||||
|
ev_value_1 = <ls_field>-value.
|
||||||
|
ENDIF.
|
||||||
|
|
||||||
|
IF ev_value_2 IS REQUESTED.
|
||||||
|
READ TABLE ct_fields INDEX 2 ASSIGNING <ls_field>.
|
||||||
|
ASSERT sy-subrc = 0.
|
||||||
|
ev_value_2 = <ls_field>-value.
|
||||||
|
ENDIF.
|
||||||
|
|
||||||
|
ENDMETHOD.
|
||||||
|
|
||||||
ENDCLASS.
|
ENDCLASS.
|
||||||
|
|
|
@ -152,22 +152,20 @@ CLASS ZCL_ABAPGIT_SERVICES_GIT IMPLEMENTATION.
|
||||||
METHOD delete_branch.
|
METHOD delete_branch.
|
||||||
|
|
||||||
DATA: lo_repo TYPE REF TO zcl_abapgit_repo_online,
|
DATA: lo_repo TYPE REF TO zcl_abapgit_repo_online,
|
||||||
ls_branch TYPE zif_abapgit_definitions=>ty_git_branch.
|
ls_branch TYPE zif_abapgit_definitions=>ty_git_branch,
|
||||||
|
lo_popups type REF TO zif_abapgit_popups.
|
||||||
|
|
||||||
|
|
||||||
lo_repo ?= zcl_abapgit_repo_srv=>get_instance( )->get( iv_key ).
|
lo_repo ?= zcl_abapgit_repo_srv=>get_instance( )->get( iv_key ).
|
||||||
|
|
||||||
ls_branch = zcl_abapgit_ui_factory=>get_popups( )->branch_list_popup( lo_repo->get_url( ) ).
|
lo_popups = zcl_abapgit_ui_factory=>get_popups( ).
|
||||||
|
ls_branch = lo_popups->branch_list_popup( iv_url = lo_repo->get_url( )
|
||||||
|
iv_hide_branch = lo_repo->get_branch_name( )
|
||||||
|
iv_hide_head = abap_true ).
|
||||||
IF ls_branch IS INITIAL.
|
IF ls_branch IS INITIAL.
|
||||||
RAISE EXCEPTION TYPE zcx_abapgit_cancel.
|
RAISE EXCEPTION TYPE zcx_abapgit_cancel.
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
|
||||||
IF ls_branch-name = 'HEAD'.
|
|
||||||
zcx_abapgit_exception=>raise( 'Cannot delete HEAD' ).
|
|
||||||
ELSEIF ls_branch-name = lo_repo->get_branch_name( ).
|
|
||||||
zcx_abapgit_exception=>raise( 'Switch branch before deleting current' ).
|
|
||||||
ENDIF.
|
|
||||||
|
|
||||||
zcl_abapgit_git_porcelain=>delete_branch(
|
zcl_abapgit_git_porcelain=>delete_branch(
|
||||||
iv_url = lo_repo->get_url( )
|
iv_url = lo_repo->get_url( )
|
||||||
is_branch = ls_branch ).
|
is_branch = ls_branch ).
|
||||||
|
@ -300,7 +298,7 @@ CLASS ZCL_ABAPGIT_SERVICES_GIT IMPLEMENTATION.
|
||||||
RAISE EXCEPTION TYPE zcx_abapgit_cancel.
|
RAISE EXCEPTION TYPE zcx_abapgit_cancel.
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
|
||||||
IF ls_branch-name = zcl_abapgit_ui_factory=>get_popups( )->c_new_branch_label.
|
IF ls_branch-name = zif_abapgit_popups=>c_new_branch_label.
|
||||||
create_branch( iv_key ).
|
create_branch( iv_key ).
|
||||||
RETURN.
|
RETURN.
|
||||||
ENDIF.
|
ENDIF.
|
||||||
|
|
|
@ -50,6 +50,8 @@ INTERFACE zif_abapgit_popups
|
||||||
!iv_url TYPE string
|
!iv_url TYPE string
|
||||||
!iv_default_branch TYPE string OPTIONAL
|
!iv_default_branch TYPE string OPTIONAL
|
||||||
!iv_show_new_option TYPE abap_bool OPTIONAL
|
!iv_show_new_option TYPE abap_bool OPTIONAL
|
||||||
|
!iv_hide_branch TYPE zif_abapgit_persistence=>ty_repo-branch_name OPTIONAL
|
||||||
|
!iv_hide_head TYPE abap_bool OPTIONAL
|
||||||
RETURNING
|
RETURNING
|
||||||
VALUE(rs_branch) TYPE zif_abapgit_definitions=>ty_git_branch
|
VALUE(rs_branch) TYPE zif_abapgit_definitions=>ty_git_branch
|
||||||
RAISING
|
RAISING
|
||||||
|
@ -77,7 +79,7 @@ INTERFACE zif_abapgit_popups
|
||||||
!iv_default_button TYPE char1 DEFAULT '1'
|
!iv_default_button TYPE char1 DEFAULT '1'
|
||||||
!iv_display_cancel_button TYPE char1 DEFAULT abap_true
|
!iv_display_cancel_button TYPE char1 DEFAULT abap_true
|
||||||
RETURNING
|
RETURNING
|
||||||
VALUE(rv_answer) TYPE char1
|
VALUE(rv_answer) TYPE char1
|
||||||
RAISING
|
RAISING
|
||||||
zcx_abapgit_exception .
|
zcx_abapgit_exception .
|
||||||
METHODS popup_to_inform
|
METHODS popup_to_inform
|
||||||
|
@ -106,8 +108,8 @@ INTERFACE zif_abapgit_popups
|
||||||
METHODS popup_to_select_from_list
|
METHODS popup_to_select_from_list
|
||||||
IMPORTING
|
IMPORTING
|
||||||
!it_list TYPE STANDARD TABLE
|
!it_list TYPE STANDARD TABLE
|
||||||
!iv_header_text TYPE csequence
|
!iv_header_text TYPE csequence
|
||||||
!iv_select_column_text TYPE csequence
|
!iv_select_column_text TYPE csequence
|
||||||
!it_columns_to_display TYPE stringtab
|
!it_columns_to_display TYPE stringtab
|
||||||
EXPORTING
|
EXPORTING
|
||||||
VALUE(et_list) TYPE STANDARD TABLE
|
VALUE(et_list) TYPE STANDARD TABLE
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
<CLSNAME>ZCX_ABAPGIT_CANCEL</CLSNAME>
|
<CLSNAME>ZCX_ABAPGIT_CANCEL</CLSNAME>
|
||||||
<VERSION>1</VERSION>
|
<VERSION>1</VERSION>
|
||||||
<LANGU>E</LANGU>
|
<LANGU>E</LANGU>
|
||||||
|
<DESCRIPT>Cancel</DESCRIPT>
|
||||||
<CATEGORY>40</CATEGORY>
|
<CATEGORY>40</CATEGORY>
|
||||||
<EXPOSURE>2</EXPOSURE>
|
<EXPOSURE>2</EXPOSURE>
|
||||||
<STATE>1</STATE>
|
<STATE>1</STATE>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user