Fix override error when link form is loaded (silverstripe#119)

Fix remove JS env check, so debugging is possible without watching admin
unclecheese · Jun 27, 2017 · 3698192 · 3698192
1 parent 50586d7
commit 3698192
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/boot/index.js b/client/src/boot/index.js
@@ -58,7 +58,7 @@ function appBoot() {
   const debugging = Config.get('debugging');
   let runMiddleware = applyMiddleware(...middleware);
 
-  if (process.env.NODE_ENV !== 'production' && debugging) {
+  if (debugging) {
     runMiddleware = applyDevtools(runMiddleware);
   }
 

diff --git a/client/src/containers/FormBuilderLoader/FormBuilderLoader.js b/client/src/containers/FormBuilderLoader/FormBuilderLoader.js
@@ -114,7 +114,7 @@ class FormBuilderLoader extends Component {
                   [state.name]: state.value,
                 });
               }, {});
-              this.props.actions.reduxForm.initialize(this.props.schemaUrl, formData);
+              this.props.actions.reduxForm.initialize(this.props.identifier, formData);
             }
           }
           return schema;

diff --git a/client/src/containers/InsertLinkModal/InsertLinkModal.js b/client/src/containers/InsertLinkModal/InsertLinkModal.js
@@ -10,7 +10,9 @@ class InsertLinkModal extends Component {
     super(props);
 
     this.handleSubmit = this.handleSubmit.bind(this);
-    props.setOverrides(props.show ? props : null);
+    if (!props.show) {
+      props.setOverrides(null);
+    }
   }
 
   componentWillReceiveProps(props) {