diff --git a/README.md b/README.md index 3f93d876e..5e644e690 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # Vulcan -[Version 1.8.1](https://github.com/VulcanJS/Vulcan/releases) +[Version 1.10.0](https://github.com/VulcanJS/Vulcan/releases) Vulcan is a React+GraphQL framework for Meteor. diff --git a/packages/vulcan-core/lib/modules/containers/withAccess.js b/packages/vulcan-core/lib/modules/containers/withAccess.js index 670cc7110..95c4d376d 100644 --- a/packages/vulcan-core/lib/modules/containers/withAccess.js +++ b/packages/vulcan-core/lib/modules/containers/withAccess.js @@ -19,7 +19,7 @@ export default function withAccess (options) { // redirect on constructor if user cannot access constructor(props) { super(props); - if(!this.canAccess(props.currentUser)) { + if(!this.canAccess(props.currentUser) && typeof redirect === 'string') { props.router.push(redirect); } } @@ -33,4 +33,4 @@ export default function withAccess (options) { return withRouter(withCurrentUser(AccessComponent)); } -} \ No newline at end of file +} diff --git a/packages/vulcan-core/lib/modules/default_resolvers.js b/packages/vulcan-core/lib/modules/default_resolvers.js index d8b5922df..48bbe342c 100644 --- a/packages/vulcan-core/lib/modules/default_resolvers.js +++ b/packages/vulcan-core/lib/modules/default_resolvers.js @@ -90,7 +90,7 @@ export const getDefaultResolvers = (collectionName, resolverOptions = defaultOpt // don't use Dataloader if doc is selected by slug const doc = documentId ? await collection.loader.load(documentId) - : slug ? await Connectors.get(collection, { slug }) : await Connectors.get(); + : slug ? await Connectors.get(collection, { slug }) : await Connectors.get(collection); if (!doc) { const MissingDocumentError = createError('app.missing_document', { message: 'app.missing_document' });