Merge remote-tracking branch 'upstream/devel' into devel

This commit is contained in:
Eric Burel 2018-07-24 15:50:54 +02:00
commit 9e2233f0c9
2 changed files with 28 additions and 2 deletions

View file

@ -1,5 +1,9 @@
<img src="https://d3vv6lp55qjaqc.cloudfront.net/items/2B3C1z2V2y421p2I0P42/vulcan-logo-noborder.png" width="200">
[![Backers on Open Collective](https://opencollective.com/vulcan/backers/badge.svg)](#backers)
[![Sponsors on Open Collective](https://opencollective.com/vulcan/sponsors/badge.svg)](#sponsors)
# Vulcan
[Version 1.11.2](https://github.com/VulcanJS/Vulcan/releases)
@ -39,3 +43,25 @@ Find more info in the [documentation](http://docs.vulcanjs.org/#Install).
You can find the older, non-Apollo version of Telescope Nova on the [nova-classic](https://github.com/TelescopeJS/Telescope/tree/nova-classic) branch.
You can find the even older, non-React version of Telescope on the [legacy](https://github.com/TelescopeJS/Telescope/tree/legacy) branch.
## Credits
### Contributors
This project exists thanks to all the people who contribute.
<a href="graphs/contributors"><img src="https://opencollective.com/vulcan/contributors.svg?width=890&button=false" /></a>
### Backers
Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/vulcan#backer)]
<a href="https://opencollective.com/vulcan#backers" target="_blank"><img src="https://opencollective.com/vulcan/backers.svg?width=890”></a>
### Sponsors
Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/vulcan#sponsor)]
<a href="https://opencollective.com/vulcan/sponsor/0/website" target="_blank"><img src="https://opencollective.com/vulcan/sponsor/0/avatar.svg"></a>

View file

@ -246,8 +246,8 @@ export const createCollection = options => {
if (terms.query) {
const query = escapeStringRegexp(terms.query);
const searchableFieldNames = _.filter(_.keys(schema), fieldName => schema[fieldName].searchable);
const currentSchema = collection.simpleSchema()._schema;
const searchableFieldNames = _.filter(_.keys(currentSchema), fieldName => currentSchema[fieldName].searchable);
if (searchableFieldNames.length) {
parameters = Utils.deepExtend(true, parameters, {
selector: {