From 6779e904489848be5d261038551566b61bc845fe Mon Sep 17 00:00:00 2001
From: Marc Bernard <59966492+mbtools@users.noreply.github.com>
Date: Tue, 3 Nov 2020 02:41:06 -0500
Subject: [PATCH] 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>
---
 src/ui/zcl_abapgit_gui_page_repo_view.clas.abap | 4 ++--
 src/ui/zcl_abapgit_popups.clas.abap             | 3 ++-
 2 files changed, 4 insertions(+), 3 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 e6d6bea70..6cacfdffa 100644
--- a/src/ui/zcl_abapgit_gui_page_repo_view.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_repo_view.clas.abap
@@ -344,11 +344,11 @@ CLASS zcl_abapgit_gui_page_repo_view IMPLEMENTATION.
     lo_repo_online ?= mo_repo. " TODO refactor this disaster
     IF lo_repo_online->get_switched_origin( ) IS NOT INITIAL.
       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 }| ).
     ELSE.
       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 }| ).
     ENDIF.
 
diff --git a/src/ui/zcl_abapgit_popups.clas.abap b/src/ui/zcl_abapgit_popups.clas.abap
index 7150b14e7..a51eff2c4 100644
--- a/src/ui/zcl_abapgit_popups.clas.abap
+++ b/src/ui/zcl_abapgit_popups.clas.abap
@@ -92,7 +92,7 @@ ENDCLASS.
 
 
 
-CLASS ZCL_ABAPGIT_POPUPS IMPLEMENTATION.
+CLASS zcl_abapgit_popups IMPLEMENTATION.
 
 
   METHOD add_field.
@@ -636,6 +636,7 @@ CLASS ZCL_ABAPGIT_POPUPS IMPLEMENTATION.
       APPEND INITIAL LINE TO lt_selection ASSIGNING <ls_sel>.
       <ls_sel>-varoption = |{ <ls_pull>-number } - { <ls_pull>-title } @{ <ls_pull>-user }|.
     ENDLOOP.
+    SORT lt_selection BY varoption DESCENDING.
 
     CALL FUNCTION 'POPUP_TO_DECIDE_LIST'
       EXPORTING