Merge branch 'release-2.0.1'

dadi · Dec 6, 2018 · d95502c · d95502c
2 parents b5f11ca + 7c29aac
commit d95502c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.1] (2018-12-06)
+
+### Fixed
+
+* fix issue with pagination when selecting referenced document
+* show 404 message when accessing collection that doesn't exist
+
 ## [2.0.0] (2018-12-05)
 
 First public release.

diff --git a/frontend/views/DocumentListView/DocumentListView.jsx b/frontend/views/DocumentListView/DocumentListView.jsx
@@ -164,9 +164,9 @@ class DocumentListView extends Component {
     const {
       search = {}
     } = state.router
-    const visibleFields = Object.keys(
+    const visibleFields = currentCollection && Object.keys(
       getVisibleFields({
-        fields: currentCollection && currentCollection.fields,
+        fields: currentCollection.fields,
         viewType: 'list'
       })
     ).concat(Constants.DEFAULT_FIELDS)

diff --git a/frontend/views/ReferenceSelectView/ReferenceSelectView.jsx b/frontend/views/ReferenceSelectView/ReferenceSelectView.jsx
@@ -269,6 +269,7 @@ class ReferenceSelectView extends Component {
         <DocumentListToolbar
           documentsMetadata={documents && documents.metadata}
           onBuildPageUrl={page => onBuildBaseUrl.call(this, {
+            createNew: !Boolean(documentId),
             page,
             referenceFieldSelect: referencedField
           })}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dadi/publish",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "DADI Publish",
   "main": "index.js",
   "scripts": {