[Rt-commit] rt branch, 5.0-trunk, updated. rt-5.0.0-166-g3890bf0db1

[? sunnavy]

The branch, 5.0-trunk has been updated
       via  3890bf0db140962878e93de04f38f636b86576fc (commit)
       via  24f68f348227a468d57dc8bc5f6b47078daaa174 (commit)
      from  39c0218da6e346de9683a4137f030acf5a204a46 (commit)

Summary of changes:
 etc/RT_Config.pm.in                                  | 1 -
 share/html/Dashboards/Elements/ShowPortlet/component | 2 +-
 share/html/Dashboards/Queries.html                   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 24f68f348227a468d57dc8bc5f6b47078daaa174
Author: Dianne Skoll <dianne at bestpractical.com>
Date:   Wed Oct 7 09:22:27 2020 -0400

    Default $SelfServicePageComponents to an empty list, not HomepageComponents
    
    HomepageComponents are a set of portlets for privileged users and as
    such can't be used by most self service users because of access
    restrictions.

diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index 3d533298f6..76f49a4627 100644
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -2963,7 +2963,6 @@ Set($SelfServiceUseDashboard, 0);
 
 C<$SelfServicePageComponents> is an arrayref of allowed components on
 the SelfService page, if you have set $SelfServiceUseDashboard to true.
-If this is not set at all, then $HomepageComponents is used instead.
 
 =cut
 
diff --git a/share/html/Dashboards/Elements/ShowPortlet/component b/share/html/Dashboards/Elements/ShowPortlet/component
index 8fb3526a54..8b8c4900ae 100644
--- a/share/html/Dashboards/Elements/ShowPortlet/component
+++ b/share/html/Dashboards/Elements/ShowPortlet/component
@@ -59,7 +59,7 @@ my $full_path = $Portlet->{path};
 my $allowed;
 
 if ($m->request_path =~ m{/SelfService/}) {
-    $allowed = grep { $_ eq $path } @{RT->Config->Get('SelfServicePageComponents') || RT->Config->Get('HomepageComponents')};
+    $allowed = grep { $_ eq $path } @{RT->Config->Get('SelfServicePageComponents') || []};
 } else {
     $allowed = grep { $_ eq $path } @{RT->Config->Get('HomepageComponents')};
 }
diff --git a/share/html/Dashboards/Queries.html b/share/html/Dashboards/Queries.html
index bce8fcc111..328d0c0f93 100644
--- a/share/html/Dashboards/Queries.html
+++ b/share/html/Dashboards/Queries.html
@@ -89,7 +89,7 @@ my %item_for;
 my @components;
 
 if ($self_service_dashboard) {
-    @components = map { type => "component", name => $_, label => loc($_) }, @{RT->Config->Get('SelfServicePageComponents') || RT->Config->Get('HomepageComponents')};
+    @components = map { type => "component", name => $_, label => loc($_) }, @{RT->Config->Get('SelfServicePageComponents') || []};
 } else {
     @components = map { type => "component", name => $_, label => loc($_) }, @{RT->Config->Get('HomepageComponents')};
 }

commit 3890bf0db140962878e93de04f38f636b86576fc
Merge: 39c0218da6 24f68f3482
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue Dec 22 22:12:38 2020 +0800

    Merge branch '5.0/limit-self-service-page-components-to-sensible-defaults' into 5.0-trunk


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