Skip to content

Commit e9ce376

Browse files
committed
condition for only taskStatus 1
1 parent 5e6cffa commit e9ce376

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/components/TaskPane/ActiveTaskDetails/ActiveTaskControls/ActiveTaskControls.jsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import messages from './Messages'
4141
import { constructChangesetUrl } from '../../../../utils/constructChangesetUrl'
4242
import { replacePropertyTags } from '../../../../hooks/UsePropertyReplacement/UsePropertyReplacement'
4343
import './ActiveTaskControls.scss'
44+
import { TASK_STATUS_FIXED } from '../../../../services/Task/TaskStatus/TaskStatus';
4445

4546
const hiddenShortcutGroup = 'taskCompletion'
4647
const hiddenShortcuts = ['skip', 'falsePositive', 'fixed', 'tooHard', 'alreadyFixed']
@@ -174,10 +175,10 @@ export class ActiveTaskControls extends Component {
174175
const message = intl.formatMessage(messages.rapidDiscardUnsavedChanges)
175176

176177
if (!this.props.rapidEditorState.hasUnsavedChanges || window.confirm(message)) {
177-
const requireComment = this.props.challenge.requireComment || this.props.challenge.parent.requireComment;
178-
const disableTaskConfirm = !requireComment && this.props.user.settings.disableTaskConfirm
178+
const requireConfirmation = this.props.challenge.requireConfirmation || this.props.challenge.parent.requireConfirmation;
179+
const disableTaskConfirm = !requireConfirmation && this.props.user.settings.disableTaskConfirm
179180

180-
if (disableTaskConfirm) {
181+
if (taskStatus === TASK_STATUS_FIXED && disableTaskConfirm) {
181182
this.setState({
182183
osmComment: `${this.props.task.parent.checkinComment}${constructChangesetUrl(this.props.task)}`,
183184
confirmingStatus: taskStatus,

src/services/Challenge/Challenge.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1022,7 +1022,7 @@ export const fetchChallenges = function (
10221022
"limitTags",
10231023
"limitReviewTags",
10241024
"taskStyles",
1025-
"requireComment",
1025+
"requireConfirmation",
10261026
"requiresLocal",
10271027
"reviewSetting",
10281028
"taskWidgetLayout",

0 commit comments

Comments
 (0)