[Rt-commit] rt branch, 5.0/self-service-home-menu, updated. rt-5.0.0-141-g79a2b94a9a

[Jim Brandt]

The branch, 5.0/self-service-home-menu has been updated
       via  79a2b94a9aae02c03510a68df1fd2dacab43def7 (commit)
       via  9f7c5d466d1295e5909fba1e4ef8e84b941a08db (commit)
      from  e94982b482e30ee331d2e6bcb124632f517de1b0 (commit)

Summary of changes:
 lib/RT/Interface/Web/MenuBuilder.pm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit 9f7c5d466d1295e5909fba1e4ef8e84b941a08db
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Thu Dec 17 13:50:23 2020 -0500

    Restore Tickets menu for self service ticket pages
    
    With the new Home menu, the change from Tickets to
    Self Service isn't needed to provide a way back to the
    home page.

diff --git a/lib/RT/Interface/Web/MenuBuilder.pm b/lib/RT/Interface/Web/MenuBuilder.pm
index 8284904a07..7c2ac6544a 100644
--- a/lib/RT/Interface/Web/MenuBuilder.pm
+++ b/lib/RT/Interface/Web/MenuBuilder.pm
@@ -1629,10 +1629,11 @@ sub BuildSelfServiceNav {
     }
 
     my $menu_label = loc('Tickets');
-    if (RT->Config->Get('SelfServiceUseDashboard')) {
-        $menu_label = loc('Self-Service');
+    my $menu_path = '/SelfService/';
+    if ( RT->Config->Get('SelfServiceUseDashboard') ) {
+        $menu_path = '/SelfService/Open.html';
     }
-    my $tickets = $top->child( tickets => title => $menu_label, path => '/SelfService/' );
+    my $tickets = $top->child( tickets => title => $menu_label, path => $menu_path );
     $tickets->child( open   => title => loc('Open tickets'),   path => '/SelfService/Open.html' );
     $tickets->child( closed => title => loc('Closed tickets'), path => '/SelfService/Closed.html' );
 

commit 79a2b94a9aae02c03510a68df1fd2dacab43def7
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Thu Dec 17 13:51:44 2020 -0500

    Remove dashes from Self Service menus

diff --git a/lib/RT/Interface/Web/MenuBuilder.pm b/lib/RT/Interface/Web/MenuBuilder.pm
index 7c2ac6544a..ffccd0adea 100644
--- a/lib/RT/Interface/Web/MenuBuilder.pm
+++ b/lib/RT/Interface/Web/MenuBuilder.pm
@@ -1233,8 +1233,8 @@ sub _BuildAdminMenu {
     if (RT->Config->Get('SelfServiceUseDashboard')) {
         if ($current_user->HasRight( Right => 'ModifyDashboard', Object => RT->System ) ) {
             my $self_service = $admin_global->child( selfservice_home =>
-                                                     title       => loc('Self-Service Home Page'),
-                                                     description => loc('Edit self-service home page dashboard'),
+                                                     title       => loc('Self Service Home Page'),
+                                                     description => loc('Edit self service home page dashboard'),
                                                      path        => '/Admin/Global/SelfServiceHomePage.html');
             if ( $request_path =~ m{^/Admin/Global/SelfServiceHomePage} ) {
                 $page->child(content => title => loc('Content'), path => '/Admin/Global/SelfServiceHomePage.html');

-----------------------------------------------------------------------