Merge remote-tracking branch 'origin/develop' into develop

James Cori · James Cori · commit 3a1b710f0cf0 · 2021-05-24T18:19:14.000-04:00
diff --git a/src/services/ChallengeService.js b/src/services/ChallengeService.js
@@ -1301,7 +1301,7 @@ async function update (currentUser, challengeId, data, isFull) {
       }
     }
     if (data.status === constants.challengeStatuses.Completed) {
-      if (challenge.status !== constants.challengeStatuses.Active) {
+      if (!_.get(challenge, 'legacy.pureV5Task') && challenge.status !== constants.challengeStatuses.Active) {
         throw new errors.BadRequestError('You cannot mark a Draft challenge as Completed')
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -1301,7 +1301,7 @@ async function update (currentUser, challengeId, data, isFull) {`
`1301`	`1301`	`}`
`1302`	`1302`	`}`
`1303`	`1303`	`if (data.status === constants.challengeStatuses.Completed) {`
`1304`		`- if (challenge.status !== constants.challengeStatuses.Active) {`
	`1304`	`+ if (!_.get(challenge, 'legacy.pureV5Task') && challenge.status !== constants.challengeStatuses.Active) {`
`1305`	`1305`	`throw new errors.BadRequestError('You cannot mark a Draft challenge as Completed')`
`1306`	`1306`	`}`
`1307`	`1307`	`}`