[Rt-commit] rt branch, 4.4/self-service-autocomplete-principals, created. rt-4.4.4-365-g5883d5a692
? sunnavy
sunnavy at bestpractical.com
Wed Apr 21 17:52:04 EDT 2021
The branch, 4.4/self-service-autocomplete-principals has been created
at 5883d5a69267b9b12f6e1fcb238b0f50537be6d7 (commit)
- Log -----------------------------------------------------------------
commit af7faa4395c9065bca9e67f30c8ce810e7737964
Author: sunnavy <sunnavy at bestpractical.com>
Date: Thu Apr 22 04:41:47 2021 +0800
Add the missing Principals autocomplete URL for Self Service
Principals autocomplete was added in
4.4/username-and-groupname-in-role-input, which shall support Self
Service interface too.
diff --git a/share/html/SelfService/Helpers/Autocomplete/Principals b/share/html/SelfService/Helpers/Autocomplete/Principals
new file mode 100644
index 0000000000..ff1277fa5d
--- /dev/null
+++ b/share/html/SelfService/Helpers/Autocomplete/Principals
@@ -0,0 +1,48 @@
+%# BEGIN BPS TAGGED BLOCK {{{
+%#
+%# COPYRIGHT:
+%#
+%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
+%# <sales at bestpractical.com>
+%#
+%# (Except where explicitly superseded by other copyright notices)
+%#
+%#
+%# LICENSE:
+%#
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%#
+%# This work is distributed in the hope that it will be useful, but
+%# WITHOUT ANY WARRANTY; without even the implied warranty of
+%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+%# General Public License for more details.
+%#
+%# You should have received a copy of the GNU General Public License
+%# along with this program; if not, write to the Free Software
+%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+%# 02110-1301 or visit their web page on the internet at
+%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
+%#
+%#
+%# CONTRIBUTION SUBMISSION POLICY:
+%#
+%# (The following paragraph is not intended to limit the rights granted
+%# to you to modify and distribute this software under the terms of
+%# the GNU General Public License and is only of importance to you if
+%# you choose to contribute your changes and enhancements to the
+%# community by submitting them to Best Practical Solutions, LLC.)
+%#
+%# By intentionally submitting any modifications, corrections or
+%# derivatives to this work, or any other work intended for use with
+%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+%# you are the copyright holder for those contributions and you grant
+%# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable,
+%# royalty-free, perpetual, license to use, copy, create derivative
+%# works based on those contributions, and sublicense and distribute
+%# those contributions and any derivatives thereof.
+%#
+%# END BPS TAGGED BLOCK }}}
+% $m->comp('/Helpers/Autocomplete/Principals', %ARGS);
commit 5883d5a69267b9b12f6e1fcb238b0f50537be6d7
Author: sunnavy <sunnavy at bestpractical.com>
Date: Thu Apr 22 04:50:51 2021 +0800
Add config $AllowGroupAutocompleteForUnprivileged
Previouly we used $AllowUserAutocompleteForUnprivileged for Principals
autocomplete, which wasn't quite right. With this new config, admins can
control autocomplete feature for users/groups, respecitvely.
Note that this config is already in RT 5(along with cored
RT-Extension-GroupSummary), though it is just a no-op there.
diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index 85b04929df..39bce36635 100644
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -1823,6 +1823,18 @@ will be able to search all your users.
Set($AllowUserAutocompleteForUnprivileged, 0);
+=item C<$AllowGroupAutocompleteForUnprivileged>
+
+Defines whether unprivileged users (users of SelfService) are allowed
+to autocomplete groups when searching. Setting this option to 1 means
+unprivileged users will be able to search all your user created
+group names. Users will also need the SeeGroup privilege to use
+this feature.
+
+=cut
+
+Set($AllowGroupAutocompleteForUnprivileged, 0);
+
=item C<$DefaultSelfServiceSearchResultFormat>
C<$DefaultSelfServiceSearchResultFormat> is the default format of
diff --git a/share/html/Helpers/Autocomplete/Principals b/share/html/Helpers/Autocomplete/Principals
index c018d7ce8c..e37036a62c 100644
--- a/share/html/Helpers/Autocomplete/Principals
+++ b/share/html/Helpers/Autocomplete/Principals
@@ -78,7 +78,8 @@ my $CurrentUser = $session{'CurrentUser'};
# Require privileged users or overriding config
$m->abort unless $CurrentUser->Privileged
- or RT->Config->Get('AllowUserAutocompleteForUnprivileged');
+ or RT->Config->Get('AllowUserAutocompleteForUnprivileged')
+ or RT->Config->Get('AllowGroupAutocompleteForUnprivileged');
# the API wants a list of ids
my @exclude = split /\s*,\s*/, $exclude;
@@ -88,49 +89,60 @@ push @exclude, RT->Nobody->id unless $include_nobody;
$m->callback( CallbackName => 'ModifyMaxResults', max => \$max );
$max //= 10;
-my $users = RT::Users->new($CurrentUser);
-$users->SimpleSearch( Privileged => $privileged,
- Return => 'Name',
- Term => $term,
- Max => $max,
- Exclude => \@exclude,
- );
-
-(my $group_term = $term) =~ s/^\s*group\s*:\s*//i;
-my $groups = RT::Groups->new( $CurrentUser );
-$groups->RowsPerPage( $max );
-$groups->LimitToUserDefinedGroups();
-$groups->Limit(
- FIELD => 'Name',
- OPERATOR => 'STARTSWITH',
- VALUE => $group_term,
- CASESENSITIVE => 0,
-);
-
-# Exclude groups we don't want
-foreach (@exclude) {
- $groups->Limit(FIELD => 'id', VALUE => $_, OPERATOR => '!=', ENTRYAGGREGATOR => 'AND');
+my ( $users, $groups );
+
+if ( $CurrentUser->Privileged or RT->Config->Get('AllowUserAutocompleteForUnprivileged') ) {
+ $users = RT::Users->new($CurrentUser);
+ $users->SimpleSearch(
+ Privileged => $privileged,
+ Return => 'Name',
+ Term => $term,
+ Max => $max,
+ Exclude => \@exclude,
+ );
+}
+
+if ( $CurrentUser->Privileged or RT->Config->Get('AllowGroupAutocompleteForUnprivileged') ) {
+ ( my $group_term = $term ) =~ s/^\s*group\s*:\s*//i;
+ $groups = RT::Groups->new($CurrentUser);
+ $groups->RowsPerPage($max);
+ $groups->LimitToUserDefinedGroups();
+ $groups->Limit(
+ FIELD => 'Name',
+ OPERATOR => 'STARTSWITH',
+ VALUE => $group_term,
+ CASESENSITIVE => 0,
+ );
+
+ # Exclude groups we don't want
+ foreach (@exclude) {
+ $groups->Limit( FIELD => 'id', VALUE => $_, OPERATOR => '!=', ENTRYAGGREGATOR => 'AND' );
+ }
}
my @suggestions;
-while ( my $user = $users->Next ) {
- my $suggestion = { id => $user->id, label => $user->Format, value => $user->EmailAddress || $user->Name };
- $m->callback( CallbackName => "ModifySuggestion", suggestion => $suggestion, user => $user );
- push @suggestions, $suggestion;
+if ($users) {
+ while ( my $user = $users->Next ) {
+ my $suggestion = { id => $user->id, label => $user->Format, value => $user->EmailAddress || $user->Name };
+ $m->callback( CallbackName => "ModifySuggestion", suggestion => $suggestion, user => $user );
+ push @suggestions, $suggestion;
+ }
}
-while ( my $group = $groups->Next ) {
- my $label = 'group:' . $group->Name;
+if ($groups) {
+ while ( my $group = $groups->Next ) {
+ my $label = 'group:' . $group->Name;
- # if group name contains, say, a comma, then use its id instead to avoid
- # parsing problems
- my $value = $delim && $label =~ $delim ? 'group:' . $group->id : $label;
+ # if group name contains, say, a comma, then use its id instead to avoid
+ # parsing problems
+ my $value = $delim && $label =~ $delim ? 'group:' . $group->id : $label;
- my $suggestion = { id => $group->id, label => $label, value => $value };
- $m->callback( CallbackName => "ModifySuggestion", suggestion => $suggestion, group => $group );
- push @suggestions, $suggestion;
+ my $suggestion = { id => $group->id, label => $label, value => $value };
+ $m->callback( CallbackName => "ModifySuggestion", suggestion => $suggestion, group => $group );
+ push @suggestions, $suggestion;
- last if @suggestions >= $max;
+ last if @suggestions >= $max;
+ }
}
</%INIT>
-----------------------------------------------------------------------
More information about the rt-commit
mailing list