Merge pull request #1241 from christianguenter2/enhancement_order

Fix deserialization dependency ENHO -> ENHS
This commit is contained in:
Lars Hvam 2018-03-10 13:25:47 +01:00 committed by GitHub
commit 30112e0557
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions

View File

@ -133,7 +133,8 @@ CLASS zcl_abapgit_object_enho_hook IMPLEMENTATION.
lv_package TYPE devclass,
ls_original_object TYPE enh_hook_admin,
lt_spaces TYPE ty_spaces_tt,
lt_enhancements TYPE enh_hook_impl_it.
lt_enhancements TYPE enh_hook_impl_it,
lx_enh_root TYPE REF TO cx_enh_root.
FIELD-SYMBOLS: <ls_enhancement> LIKE LINE OF lt_enhancements.
@ -184,10 +185,10 @@ CLASS zcl_abapgit_object_enho_hook IMPLEMENTATION.
spot = <ls_enhancement>-spotname
parent_full_name = <ls_enhancement>-parent_full_name ).
ENDLOOP.
lo_hook_impl->if_enh_object~save( ).
lo_hook_impl->if_enh_object~save( run_dark = abap_true ).
lo_hook_impl->if_enh_object~unlock( ).
CATCH cx_enh_root.
zcx_abapgit_exception=>raise( 'error deserializing ENHO hook' ).
CATCH cx_enh_root INTO lx_enh_root.
zcx_abapgit_exception=>raise( lx_enh_root->get_text( ) ).
ENDTRY.
ENDMETHOD. "zif_abapgit_object_enho~deserialize

View File

@ -130,7 +130,7 @@ ENDCLASS.
CLASS ZCL_ABAPGIT_OBJECTS IMPLEMENTATION.
CLASS zcl_abapgit_objects IMPLEMENTATION.
METHOD changed_by.
@ -581,11 +581,17 @@ CLASS ZCL_ABAPGIT_OBJECTS IMPLEMENTATION.
APPEND <ls_result> TO rt_results.
ENDLOOP.
* ENHS has to be handled before ENHO
LOOP AT it_results ASSIGNING <ls_result> WHERE obj_type = 'ENHS'.
APPEND <ls_result> TO rt_results.
ENDLOOP.
LOOP AT it_results ASSIGNING <ls_result>
WHERE obj_type <> 'IASP'
AND obj_type <> 'PROG'
AND obj_type <> 'XSLT'
AND obj_type <> 'PINF'.
AND obj_type <> 'PINF'
AND obj_type <> 'ENHS'.
APPEND <ls_result> TO rt_results.
ENDLOOP.