From fd86eaa0bc3d21e4bbce470e2403fcc234c3c3dd Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Tue, 19 Jan 2021 02:11:22 -0500 Subject: [PATCH] Repo view: Adjust link to settings & render transport (#4422) * Repo view: Adjust link to settings & render transport - Update link text - Re-init flag to render transport (in case the package has changed) * Main langu --- .../zcl_abapgit_gui_page_repo_view.clas.abap | 68 +++++++++---------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/src/ui/zcl_abapgit_gui_page_repo_view.clas.abap b/src/ui/zcl_abapgit_gui_page_repo_view.clas.abap index 63b402ee3..3d1228ff7 100644 --- a/src/ui/zcl_abapgit_gui_page_repo_view.clas.abap +++ b/src/ui/zcl_abapgit_gui_page_repo_view.clas.abap @@ -123,7 +123,7 @@ CLASS zcl_abapgit_gui_page_repo_view DEFINITION !is_item TYPE zif_abapgit_definitions=>ty_repo_item RETURNING VALUE(rv_inactive_html_code) TYPE string . - METHODS open_in_master_language + METHODS open_in_main_language RAISING zcx_abapgit_exception . METHODS render_order_by @@ -628,9 +628,6 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_REPO_VIEW IMPLEMENTATION. lv_package = mo_repo->get_package( ). - mv_are_changes_recorded_in_tr = zcl_abapgit_factory=>get_sap_package( lv_package - )->are_changes_recorded_in_tr_req( ). - CATCH zcx_abapgit_exception INTO lx_error. " Reset 'last shown repo' so next start will go to repo overview " and allow troubleshooting of issue @@ -709,24 +706,24 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_REPO_VIEW IMPLEMENTATION. ENDMETHOD. - METHOD open_in_master_language. + METHOD open_in_main_language. DATA: - lv_master_language TYPE spras, - lt_spagpa TYPE STANDARD TABLE OF rfc_spagpa, - ls_spagpa LIKE LINE OF lt_spagpa, - ls_item TYPE zif_abapgit_definitions=>ty_item, - lv_subrc TYPE syst-subrc, - lv_save_sy_langu TYPE sy-langu, - lv_tcode TYPE tcode. + lv_main_language TYPE spras, + lt_spagpa TYPE STANDARD TABLE OF rfc_spagpa, + ls_spagpa LIKE LINE OF lt_spagpa, + ls_item TYPE zif_abapgit_definitions=>ty_item, + lv_subrc TYPE syst-subrc, + lv_save_sy_langu TYPE sy-langu, + lv_tcode TYPE tcode. " https://blogs.sap.com/2017/01/13/logon-language-sy-langu-and-rfc/ - lv_master_language = mo_repo->get_dot_abapgit( )->get_master_language( ). + lv_main_language = mo_repo->get_dot_abapgit( )->get_master_language( ). lv_tcode = get_abapgit_tcode( ). ASSERT lv_tcode IS NOT INITIAL. - IF lv_master_language = sy-langu. + IF lv_main_language = sy-langu. zcx_abapgit_exception=>raise( |Repo already opened in main language| ). ENDIF. @@ -738,7 +735,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_REPO_VIEW IMPLEMENTATION. ENDIF. lv_save_sy_langu = sy-langu. - SET LOCALE LANGUAGE lv_master_language. + SET LOCALE LANGUAGE lv_main_language. ls_spagpa-parid = zif_abapgit_definitions=>c_spagpa_param_repo_key. ls_spagpa-parval = mo_repo->get_key( ). @@ -773,18 +770,17 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_REPO_VIEW IMPLEMENTATION. METHOD render_content. - DATA: lt_repo_items TYPE zif_abapgit_definitions=>ty_repo_item_tt, - lo_browser TYPE REF TO zcl_abapgit_repo_content_list, - lx_error TYPE REF TO zcx_abapgit_exception, - lv_lstate TYPE char1, - lv_rstate TYPE char1, - lv_max TYPE abap_bool, - lv_max_str TYPE string, - lv_add_str TYPE string, - li_log TYPE REF TO zif_abapgit_log, - lv_render_transports TYPE abap_bool, - lv_msg TYPE string, - lo_news TYPE REF TO zcl_abapgit_news. + DATA: lt_repo_items TYPE zif_abapgit_definitions=>ty_repo_item_tt, + lo_browser TYPE REF TO zcl_abapgit_repo_content_list, + lx_error TYPE REF TO zcx_abapgit_exception, + lv_lstate TYPE char1, + lv_rstate TYPE char1, + lv_max TYPE abap_bool, + lv_max_str TYPE string, + lv_add_str TYPE string, + li_log TYPE REF TO zif_abapgit_log, + lv_msg TYPE string, + lo_news TYPE REF TO zcl_abapgit_news. FIELD-SYMBOLS LIKE LINE OF lt_repo_items. @@ -795,6 +791,9 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_REPO_VIEW IMPLEMENTATION. " Reinit, for the case of type change mo_repo = zcl_abapgit_repo_srv=>get_instance( )->get( mo_repo->get_key( ) ). + mv_are_changes_recorded_in_tr = zcl_abapgit_factory=>get_sap_package( mo_repo->get_package( ) + )->are_changes_recorded_in_tr_req( ). + lo_news = zcl_abapgit_news=>create( mo_repo ). CREATE OBJECT ri_html TYPE zcl_abapgit_html. @@ -806,9 +805,6 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_REPO_VIEW IMPLEMENTATION. ri_html->add( zcl_abapgit_gui_chunk_lib=>render_news( io_news = lo_news ) ). - lv_render_transports = zcl_abapgit_factory=>get_cts_api( - )->is_chrec_possible_for_package( mo_repo->get_package( ) ). - CREATE OBJECT lo_browser EXPORTING io_repo = mo_repo. @@ -868,7 +864,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_REPO_VIEW IMPLEMENTATION. EXIT. " current loop ENDIF. ri_html->add( render_item( is_item = - iv_render_transports = lv_render_transports ) ). + iv_render_transports = mv_are_changes_recorded_in_tr ) ). ENDLOOP. ri_html->add( '' ). @@ -886,13 +882,13 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_REPO_VIEW IMPLEMENTATION. lv_max_str = |first { mv_max_lines } objects|. ENDIF. lv_add_str = |+{ mv_max_setting }|. - ri_html->add( |Only { lv_max_str } shown in list. Display { + ri_html->add( |Only { lv_max_str } objects shown in list. Display { ri_html->a( iv_txt = lv_add_str iv_act = c_actions-display_more ) - } more. (Set in Advanced > { - ri_html->a( iv_txt = 'Settings' + } more (change in Settings > { + ri_html->a( iv_txt = 'Personal Settings' iv_act = zif_abapgit_definitions=>c_action-go_settings_personal ) - } )| ). + })| ). ri_html->add( '' ). ENDIF. @@ -1265,7 +1261,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_REPO_VIEW IMPLEMENTATION. rs_handled-state = zcl_abapgit_gui=>c_event_state-re_render. WHEN zif_abapgit_definitions=>c_action-repo_open_in_master_lang. - open_in_master_language( ). + open_in_main_language( ). rs_handled-state = zcl_abapgit_gui=>c_event_state-re_render. WHEN c_actions-repo_switch_origin_to_pr.