Merge branch 'simple_exercise_form' of github.com:ReCodEx/web-app int…

…o simple_exercise_form
ReCodEx · Dec 7, 2017 · c4c0fc1 · c4c0fc1
2 parents b1b4ab0 + 50cf7dd
commit c4c0fc1
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 212 deletions.
diff --git a/src/components/forms/EditTestsForm/EditTestsForm.js b/src/components/forms/EditTestsForm/EditTestsForm.js
@@ -8,13 +8,16 @@ import { Alert } from 'react-bootstrap';
 import EditTestsTest from './EditTestsTest';
 import { CheckboxField } from '../Fields';
 import SubmitButton from '../SubmitButton';
+import Button from '../../widgets/FlatButton';
+import { RefreshIcon } from '../../icons';
 
 class EditTestsForm extends Component {
   render() {
     const {
       dirty,
       submitting,
       handleSubmit,
+      reset,
       hasFailed = false,
       hasSucceeded = false,
       invalid,
@@ -50,6 +53,22 @@ class EditTestsForm extends Component {
         />
 
         <div className="text-center">
+          {dirty &&
+            <span>
+              <Button
+                type="reset"
+                onClick={reset}
+                bsStyle={'danger'}
+                className="btn-flat"
+              >
+                <RefreshIcon /> &nbsp;
+                <FormattedMessage
+                  id="app.editTestsForm.reset"
+                  defaultMessage="Reset"
+                />
+              </Button>{' '}
+            </span>}
+
           <SubmitButton
             id="editTests"
             invalid={invalid}
@@ -88,6 +107,7 @@ class EditTestsForm extends Component {
 EditTestsForm.propTypes = {
   values: PropTypes.array,
   handleSubmit: PropTypes.func.isRequired,
+  reset: PropTypes.func.isRequired,
   dirty: PropTypes.bool,
   submitting: PropTypes.bool,
   hasFailed: PropTypes.bool,

diff --git a/src/components/forms/EditTestsForm/EditTestsTest.js b/src/components/forms/EditTestsForm/EditTestsTest.js
@@ -56,7 +56,7 @@ const EditTestsTest = ({ fields, isUniform, testValues }) => {
       <div style={{ textAlign: 'right' }}>
         <Button
           onClick={() =>
-            fields.push({ name: `Test ${fields.length}`, weight: 100 })}
+            fields.push({ name: 'Test ' + (fields.length + 1), weight: '100' })}
           bsStyle={'primary'}
           className="btn-flat"
         >