OBPIH-5809 Approval rollback - Approvals end to end workflow (fix after QA) #4335
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
awalkowiak
approved these changes
Oct 17, 2023
drodzewicz
approved these changes
Oct 17, 2023
awalkowiak
requested changes
Oct 17, 2023
| @@ -90,7 +90,11 @@ | |||
| <g:isUserInAllRoles location="${stockMovement?.origin?.id}" roles="${[RoleType.ROLE_REQUISITION_APPROVER]}"> | |||
| <g:set var="userHasRequestApproverRole" value="${true}"/> | |||
| </g:isUserInAllRoles> | |||
| <g:set var="isApprovalRequired" value="${stockMovement?.requisition?.approvalRequired && stockMovement?.origin?.isApprovalRequired()}" /> | |||
| <g:set var="isApprovalRequired" | |||
There was a problem hiding this comment.
This also could be moved to the StockMovement
| <g:set var="isApprovalRequired" | ||
| value="${stockMovement?.requisition?.approvalRequired && | ||
| stockMovement?.origin?.isApprovalRequired() && | ||
| stockMovement.status < RequisitionStatus.PICKING}" |
There was a problem hiding this comment.
I feel like this is dangerous - won't it compare the statuses chronologically?
There was a problem hiding this comment.
It is compared by sortOrder
There was a problem hiding this comment.
Are you sure? it's compare method in the RequisitionStatus which is not the same as compareTo method available in Comparator interface. Those are not the same.
There was a problem hiding this comment.
@alannadolny yup please make sure about that one
There was a problem hiding this comment.
This topic was previously answered by Justin: #4133 (comment)
| <g:set var="isApprovalRequired" value="${stockMovement?.requisition?.approvalRequired && stockMovement?.origin?.isApprovalRequired()}" /> | ||
| <g:set var="isApprovalRequired" | ||
| value="${stockMovement?.requisition?.approvalRequired && | ||
| stockMovement?.origin?.isApprovalRequired() && |
There was a problem hiding this comment.
Suggested change
| stockMovement?.origin?.isApprovalRequired() && | |
| stockMovement?.origin?.approvalRequired && |
awalkowiak
approved these changes
Oct 17, 2023
awalkowiak
pushed a commit
that referenced
this pull request
Oct 26, 2023
…er QA) (#4335) * OBPIH-5809 Fix throwing error with missing required argument * OBPIH-5809 Show buttons when stock movement status is higher than approved / rejected * OBPIH-5809 Fixes after review * OBPIH-5809 Fixes after review * OBPIH-5809 Add comments
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.
No description provided.