Merge pull request #329 from open-sausages/pulls/4.0/fix-uploadfield-…

…errors BUG Fix JS errors in UploadField.js and InsertMediaModal.js
silverstripe · Dec 16, 2016 · 2d1b572 · 2d1b572
2 parents 7b3f763 + 8cef515
commit 2d1b572
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/dist/styles/bundle.css b/client/dist/styles/bundle.css
@@ -986,7 +986,7 @@
 }
 
 .gallery__table-image--error:after{
-  content:'Q';
+  content:"Q";
   line-height:68px;
   font-size:30px;
   display:inline;

diff --git a/client/src/containers/InsertMediaModal/InsertMediaModal.js b/client/src/containers/InsertMediaModal/InsertMediaModal.js
@@ -57,7 +57,10 @@ class InsertMediaModal extends Component {
   setOverrides(props) {
     if (!props || this.props.schemaUrl !== props.schemaUrl) {
       // clear any overrides that may be in place
-      this.props.actions.schema.setSchemaStateOverrides(props.schemaUrl, null);
+      const schemaUrl = props && props.schemaUrl || this.props.schemaUrl;
+      if (schemaUrl) {
+        this.props.actions.schema.setSchemaStateOverrides(schemaUrl, null);
+      }
     }
     if (props && props.schemaUrl) {
       const attrs = Object.assign({}, props.fileAttributes);

diff --git a/code/Forms/UploadField.php b/code/Forms/UploadField.php
@@ -94,6 +94,7 @@ public function getSchemaStateDefaults()
     {
         $state = parent::getSchemaStateDefaults();
         $state['data']['files'] = $this->getEncodedItems();
+        $state['value'] = $this->Value() ?: [ 'Files' => []];
         return $state;
     }