diff --git a/.mocharc.js b/.mocharc.js index 858dbd772b..42e32aea7a 100644 --- a/.mocharc.js +++ b/.mocharc.js @@ -3,5 +3,6 @@ module.exports = { '@babel/register', 'coffeescript/register', 'coffee-react/register' - ] -} \ No newline at end of file + ], + retries: 1 +} diff --git a/app/classifier/tasks/combo/editor.cjsx b/app/classifier/tasks/combo/editor.cjsx index 323c43982f..1159817664 100644 --- a/app/classifier/tasks/combo/editor.cjsx +++ b/app/classifier/tasks/combo/editor.cjsx @@ -7,6 +7,7 @@ ComboTaskEditor = createReactClass getDefaultProps: -> workflow: null task: null + taskPrefix: '' onChange: -> componentWillMount: () -> @@ -47,6 +48,7 @@ ComboTaskEditor = createReactClass render: -> + [root, taskKey] = @props.taskPrefix.split '.' tasks = require('..').default

Add any number of tasks here and they'll be shown in one step.

@@ -77,7 +79,7 @@ ComboTaskEditor = createReactClass


This overrides anything set by a sub-task. diff --git a/app/classifier/tasks/dropdown/editor.jsx b/app/classifier/tasks/dropdown/editor.jsx index d77bd47d8c..41b42a6479 100644 --- a/app/classifier/tasks/dropdown/editor.jsx +++ b/app/classifier/tasks/dropdown/editor.jsx @@ -120,6 +120,7 @@ export default class DropdownEditor extends React.Component { } render() { + const [root, taskKey] = this.props.taskPrefix.split('.'); const handleChange = handleInputChange.bind(this.props.workflow); const selects = this.props.task.selects; @@ -218,7 +219,7 @@ export default class DropdownEditor extends React.Component { Next task
+ [root, taskKey] = @props.taskPrefix.split '.' handleChange = handleInputChange.bind @props.workflow [mainTextKey, choicesKey] = switch @props.task.type @@ -130,7 +131,7 @@ module.exports = createReactClass

Next task{' '} - +
@@ -304,7 +305,7 @@ module.exports = createReactClass
Next task{' '} - +
}
diff --git a/app/classifier/tasks/next-task-selector.cjsx b/app/classifier/tasks/next-task-selector.cjsx index 796da49f88..76f54ce1d0 100644 --- a/app/classifier/tasks/next-task-selector.cjsx +++ b/app/classifier/tasks/next-task-selector.cjsx @@ -21,7 +21,7 @@ module.exports = createReactClass