UI: Sort "Switch origin" by PR number (#4127)

- Sort descending by PR number
- Rename menu items

Closes https://github.com/abapGit/abapGit/issues/4031

Co-authored-by: Lars Hvam <larshp@hotmail.com>
This commit is contained in:
Marc Bernard 2020-11-03 02:41:06 -05:00 committed by GitHub
parent e6acd28bda
commit 6779e90448
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

View File

@ -344,11 +344,11 @@ CLASS zcl_abapgit_gui_page_repo_view IMPLEMENTATION.
lo_repo_online ?= mo_repo. " TODO refactor this disaster lo_repo_online ?= mo_repo. " TODO refactor this disaster
IF lo_repo_online->get_switched_origin( ) IS NOT INITIAL. IF lo_repo_online->get_switched_origin( ) IS NOT INITIAL.
ro_branch_dropdown->add( ro_branch_dropdown->add(
iv_txt = 'Switch Origin: Revert <sup>beta<sup>' iv_txt = 'Revert to Previous Branch'
iv_act = |{ c_actions-repo_reset_origin }| ). iv_act = |{ c_actions-repo_reset_origin }| ).
ELSE. ELSE.
ro_branch_dropdown->add( ro_branch_dropdown->add(
iv_txt = 'Switch Origin: to PR <sup>beta<sup>' iv_txt = 'Switch to PR Branch'
iv_act = |{ c_actions-repo_switch_origin_to_pr }| ). iv_act = |{ c_actions-repo_switch_origin_to_pr }| ).
ENDIF. ENDIF.

View File

@ -92,7 +92,7 @@ ENDCLASS.
CLASS ZCL_ABAPGIT_POPUPS IMPLEMENTATION. CLASS zcl_abapgit_popups IMPLEMENTATION.
METHOD add_field. METHOD add_field.
@ -636,6 +636,7 @@ CLASS ZCL_ABAPGIT_POPUPS IMPLEMENTATION.
APPEND INITIAL LINE TO lt_selection ASSIGNING <ls_sel>. APPEND INITIAL LINE TO lt_selection ASSIGNING <ls_sel>.
<ls_sel>-varoption = |{ <ls_pull>-number } - { <ls_pull>-title } @{ <ls_pull>-user }|. <ls_sel>-varoption = |{ <ls_pull>-number } - { <ls_pull>-title } @{ <ls_pull>-user }|.
ENDLOOP. ENDLOOP.
SORT lt_selection BY varoption DESCENDING.
CALL FUNCTION 'POPUP_TO_DECIDE_LIST' CALL FUNCTION 'POPUP_TO_DECIDE_LIST'
EXPORTING EXPORTING