Minimal support for custom permission levels in Accounts Manager which are not provided in the userRoles hash #2629
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
the active %userRoles hash. Will prevent Accounts Manager from failing. See openwebwork#2625 but when editing a user with such a value, will only allow choosing a defined level.
drgrice1
reviewed
Nov 22, 2024
| @@ -51,7 +51,7 @@ | |||
| id => $fieldName . '_id', class => 'form-select form-select-sm w-auto flex-grow-0', | |||
| 'aria-labelledby' => 'permission_header' =%> | |||
| % } else { | |||
| <%= maketext((grep { $ce->{userRoles}{$_} eq $value } keys %{ $ce->{userRoles} })[0]) %> | |||
| <%= maketext((grep { $ce->{userRoles}{$_} eq $value } keys %{ $ce->{userRoles} })[0] // "PermLevel$value") %> | |||
There was a problem hiding this comment.
I think this should be
Suggested change
| <%= maketext((grep { $ce->{userRoles}{$_} eq $value } keys %{ $ce->{userRoles} })[0] // "PermLevel$value") %> | |
| % if (my $roleName = (grep { $ce->{userRoles}{$_} eq $value } keys %{ $ce->{userRoles} })[0]) { | |
| <%= maketext($roleName) %> | |
| % } else { | |
| <%= maketext("Permission Level [_1]", $value) %> | |
| % } |
With this "Permission Level [_1]" will get translated. With your code it will not. I also don't like abbreviations shown in the user interface, so I would rather have "Permission Level" rather than "PermLevel".
Although, I was alternately thinking that maybe "Permission Level" in any form isn't needed. This is the "Permission Level" column in the table. So maybe instead just show the unknown permission level numerically? So perhaps this should be
Suggested change
| <%= maketext((grep { $ce->{userRoles}{$_} eq $value } keys %{ $ce->{userRoles} })[0] // "PermLevel$value") %> | |
| % if (my $roleName = (grep { $ce->{userRoles}{$_} eq $value } keys %{ $ce->{userRoles} })[0]) { | |
| <%= maketext($roleName) %> | |
| % } else { | |
| <%= $value %> | |
| % } |
Or maybe use maketext('Unknown: [_1]', $value)?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A minimal fix for #2625.
This only prevents the error and allows the Accounts Manager to load. A fake permission level name "PermLevelN" will appear in the table. It is not a value which can be selected, and editing a user with such a value will force selecting a defined permission level.