From 7190cab4138c951b4f54cbc1e32bff1237911d92 Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Tue, 29 Nov 2022 08:49:44 -0500 Subject: [PATCH] Repo View: Consolidate "Stage" and "Force Stage" (#5889) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Lars Hvam Co-authored-by: Christian Günter --- src/ui/zcl_abapgit_gui_page_repo_view.clas.abap | 7 +------ 1 file changed, 1 insertion(+), 6 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 0a1fa5852..e10d97c7e 100644 --- a/src/ui/zcl_abapgit_gui_page_repo_view.clas.abap +++ b/src/ui/zcl_abapgit_gui_page_repo_view.clas.abap @@ -280,9 +280,6 @@ CLASS zcl_abapgit_gui_page_repo_view IMPLEMENTATION. ENDIF. IF mo_repo->is_offline( ) = abap_false. " Online ? - ro_advanced_dropdown->add( iv_txt = 'Force Stage' - iv_act = |{ zif_abapgit_definitions=>c_action-go_stage }?key={ mv_key }| ). - CLEAR lv_crossout. IF zcl_abapgit_auth=>is_allowed( zif_abapgit_auth=>c_authorization-transport_to_branch ) = abap_false. lv_crossout = zif_abapgit_html=>c_html_opt-crossout. @@ -479,12 +476,10 @@ CLASS zcl_abapgit_gui_page_repo_view IMPLEMENTATION. iv_act = |{ zif_abapgit_definitions=>c_action-git_pull }?key={ mv_key }| iv_opt = iv_pull_opt ). ENDIF. - IF mo_repo_aggregated_state->local( ) IS NOT INITIAL. " Something new at local + IF mo_repo_aggregated_state->is_unchanged( ) = abap_false. " Any changes ro_toolbar->add( iv_txt = 'Stage' iv_act = |{ zif_abapgit_definitions=>c_action-go_stage }?key={ mv_key }| iv_opt = zif_abapgit_html=>c_html_opt-strong ). - ENDIF. - IF mo_repo_aggregated_state->is_unchanged( ) = abap_false. " Any changes ro_toolbar->add( iv_txt = 'Diff' iv_act = |{ zif_abapgit_definitions=>c_action-go_repo_diff }?key={ mv_key }| iv_opt = zif_abapgit_html=>c_html_opt-strong ).