Fixes #22601: Missing validation button with admin #554
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
fanf
commented
Apr 6, 2023
| @@ -167,12 +170,20 @@ class ChangeRequestDetails extends DispatchSnippet with Loggable { | |||
| } | |||
|
|
|||
| def displayActionButton(cr: ChangeRequest, step: WorkflowNodeId): NodeSeq = { | |||
| val authz = CurrentUser.getRights.authorizationTypes.toSeq.collect { case right: ActionType.Edit => right.authzKind } | |||
| val authz = Nil // we are sideStepping it, see: https://issues.rudder.io/issues/22595 | |||
There was a problem hiding this comment.
this is the problem: we don't look for any because we are comaring on strings, not with the correct Authorization method.
We can change that now, see: https://issues.rudder.io/issues/22595
fanf
commented
Apr 6, 2023
| val correctActor = selfValidation().getOrElse(false) || !isCreator | ||
| correctActor && CurrentUser.checkRights(AuthorizationType.Validator.Edit) | ||
| } | ||
|
|
There was a problem hiding this comment.
These two methods are the relevant changes: we use CurrentUser.checkRights in place of a comparison on string. That methods correctly check for the any right that admin has.
|
We can't remove currentUserRights: Seq[String] parameters because they are defined in the trait within Rudder ? |
|
yes, the API is there, and we are trying to make 7.3 stable, and I'm not sure about what we want for an API |
fanf
force-pushed
the
bug_22601/missing_validation_button_with_admin
branch
from
0fc0737
to
3103cf4
Compare
VinceMacBuche
approved these changes
Apr 25, 2023
|
OK, merging this PR |
Normation-Quality-Assistant
merged commit 5cb1b1b
into
Normation:branches/rudder/7.3
8 checks passed
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.
https://issues.rudder.io/issues/22601