condition for only taskStatus 1

maproulette · Jan 15, 2025 · e9ce376 · e9ce376
1 parent 5e6cffa
commit e9ce376
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/components/TaskPane/ActiveTaskDetails/ActiveTaskControls/ActiveTaskControls.jsx b/src/components/TaskPane/ActiveTaskDetails/ActiveTaskControls/ActiveTaskControls.jsx
@@ -41,6 +41,7 @@ import messages from './Messages'
 import { constructChangesetUrl } from '../../../../utils/constructChangesetUrl'
 import { replacePropertyTags } from '../../../../hooks/UsePropertyReplacement/UsePropertyReplacement'
 import './ActiveTaskControls.scss'
+import { TASK_STATUS_FIXED } from '../../../../services/Task/TaskStatus/TaskStatus';
 
 const hiddenShortcutGroup = 'taskCompletion'
 const hiddenShortcuts = ['skip', 'falsePositive', 'fixed', 'tooHard', 'alreadyFixed']
@@ -174,10 +175,10 @@ export class ActiveTaskControls extends Component {
     const message = intl.formatMessage(messages.rapidDiscardUnsavedChanges)
 
     if (!this.props.rapidEditorState.hasUnsavedChanges || window.confirm(message)) {
-      const requireComment = this.props.challenge.requireComment || this.props.challenge.parent.requireComment;
-      const disableTaskConfirm = !requireComment && this.props.user.settings.disableTaskConfirm
+      const requireConfirmation = this.props.challenge.requireConfirmation || this.props.challenge.parent.requireConfirmation;
+      const disableTaskConfirm = !requireConfirmation && this.props.user.settings.disableTaskConfirm
 
-      if (disableTaskConfirm) {
+      if (taskStatus === TASK_STATUS_FIXED && disableTaskConfirm) {
         this.setState({
           osmComment: `${this.props.task.parent.checkinComment}${constructChangesetUrl(this.props.task)}`,
           confirmingStatus: taskStatus,

diff --git a/src/services/Challenge/Challenge.js b/src/services/Challenge/Challenge.js
@@ -1022,7 +1022,7 @@ export const fetchChallenges = function (
           "limitTags",
           "limitReviewTags",
           "taskStyles",
-          "requireComment",
+          "requireConfirmation",
           "requiresLocal",
           "reviewSetting",
           "taskWidgetLayout",