Skip to content

fix some task review status not found and locking bugs #1207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CollinBeczak wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −3
Open

fix some task review status not found and locking bugs #1207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions app/org/maproulette/framework/model/Task.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,14 @@ object Task extends CommonField {
if (allowChange)
toSet == STATUS_FIXED || toSet == STATUS_FALSE_POSITIVE || toSet == STATUS_TOO_HARD
else false
case STATUS_ANSWERED => false
case STATUS_VALIDATED => false
case STATUS_ANSWERED =>
if (allowChange)
toSet == STATUS_FIXED || toSet == STATUS_FALSE_POSITIVE || toSet == STATUS_ALREADY_FIXED || toSet == STATUS_TOO_HARD
else false
case STATUS_VALIDATED =>
if (allowChange)
toSet == STATUS_FIXED || toSet == STATUS_FALSE_POSITIVE || toSet == STATUS_ALREADY_FIXED || toSet == STATUS_TOO_HARD
else false
case STATUS_DISABLED => toSet == STATUS_CREATED
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/org/maproulette/framework/service/TaskReviewService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@ class TaskReviewService @Inject() (
excludeOtherReviewers
)

addClaimedByFilter(query, user.id)
addLockedFilter(addClaimedByFilter(query, user.id))
}

private def addClaimedByFilter(query: Query, userId: Long): Query = {
Expand Down
Loading