From 4c40ca0232503ccc8a3319c53080e9a269a83e40 Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Thu, 5 Sep 2024 01:51:42 -0400 Subject: [PATCH 1/3] JOBD: Clear `changedby` field (#7039) --- src/objects/zcl_abapgit_object_jobd.clas.abap | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/objects/zcl_abapgit_object_jobd.clas.abap b/src/objects/zcl_abapgit_object_jobd.clas.abap index c4208b2a7..04945ceac 100644 --- a/src/objects/zcl_abapgit_object_jobd.clas.abap +++ b/src/objects/zcl_abapgit_object_jobd.clas.abap @@ -74,6 +74,7 @@ CLASS zcl_abapgit_object_jobd IMPLEMENTATION. DATA: lr_job_definition TYPE REF TO data, lo_job_definition TYPE REF TO object, + lx_error TYPE REF TO cx_root, lv_name TYPE ty_jd_name. FIELD-SYMBOLS: TYPE any, @@ -105,8 +106,8 @@ CLASS zcl_abapgit_object_jobd IMPLEMENTATION. EXPORTING im_jd_attributes = . - CATCH cx_root. - zcx_abapgit_exception=>raise( |Error deserializing JOBD| ). + CATCH cx_root INTO lx_error. + zcx_abapgit_exception=>raise_with_text( lx_error ). ENDTRY. zcl_abapgit_objects_activation=>add_item( ms_item ). @@ -240,7 +241,7 @@ CLASS zcl_abapgit_object_jobd IMPLEMENTATION. ASSIGN COMPONENT 'CREATED_TIME' OF STRUCTURE TO . CLEAR . - ASSIGN COMPONENT 'CHANGED_BY' OF STRUCTURE TO . + ASSIGN COMPONENT 'CHANGEDBY' OF STRUCTURE TO . CLEAR . ASSIGN COMPONENT 'CHANGED_DATE' OF STRUCTURE TO . From 0525d013947ac07c596e829903358b55b921062b Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Thu, 5 Sep 2024 04:31:43 -0400 Subject: [PATCH 2/3] SFPF: Add syntax highlighting for `xdp` files (#7040) Co-authored-by: Lars Hvam --- src/syntax/zcl_abapgit_syntax_factory.clas.abap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/syntax/zcl_abapgit_syntax_factory.clas.abap b/src/syntax/zcl_abapgit_syntax_factory.clas.abap index f24868e77..6f1e62929 100644 --- a/src/syntax/zcl_abapgit_syntax_factory.clas.abap +++ b/src/syntax/zcl_abapgit_syntax_factory.clas.abap @@ -25,7 +25,7 @@ CLASS zcl_abapgit_syntax_factory IMPLEMENTATION. " Create instance of highlighter dynamically dependent on syntax type IF iv_filename CP '*.abap'. CREATE OBJECT ro_instance TYPE zcl_abapgit_syntax_abap. - ELSEIF iv_filename CP '*.xml' OR iv_filename CP '*.html'. + ELSEIF iv_filename CP '*.xml' OR iv_filename CP '*.html' OR iv_filename CP '*.xdp'. CREATE OBJECT ro_instance TYPE zcl_abapgit_syntax_xml. ELSEIF iv_filename CP '*.css'. CREATE OBJECT ro_instance TYPE zcl_abapgit_syntax_css. From 65f8fa87ac3369b187a740dc71b1f93179800764 Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Thu, 5 Sep 2024 08:46:28 -0400 Subject: [PATCH 3/3] SFPF: Fix check if object exists (#7041) Co-authored-by: Lars Hvam --- src/objects/zcl_abapgit_object_sfpf.clas.abap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/objects/zcl_abapgit_object_sfpf.clas.abap b/src/objects/zcl_abapgit_object_sfpf.clas.abap index b6775aa08..29564ada8 100644 --- a/src/objects/zcl_abapgit_object_sfpf.clas.abap +++ b/src/objects/zcl_abapgit_object_sfpf.clas.abap @@ -282,10 +282,10 @@ CLASS zcl_abapgit_object_sfpf IMPLEMENTATION. DATA: lv_name TYPE fpname. + " Check for any state SELECT SINGLE name FROM fplayout INTO lv_name - WHERE name = ms_item-obj_name - AND state = 'A'. + WHERE name = ms_item-obj_name. rv_bool = boolc( sy-subrc = 0 ). ENDMETHOD.