hiro/Vulcan
1
0
Fork 0
mirror of https://github.com/vale981/Vulcan synced 2025-03-06 01:51:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small fixes

Browse source
This commit is contained in:
SachaG 2017-10-05 10:17:14 +09:00
parent 85506b858f
commit 7a921915c3
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/example-forum/lib/components/posts/PostsList.jsx
View file

@ -17,7 +17,7 @@ const PostsList = ({className, results, loading, count, totalCount, loadMore, sh
const hasMore = totalCount > results.length;
return (
<div className={classNames(className, 'posts-list')}>
<div className={classNames(className, 'posts-list', `posts-list-${terms.view}`)}>
{showHeader ? <Components.PostsListHeader/> : null}
{error ? <Error error={Utils.decodeIntlError(error)} /> : null }
<div className="posts-list-content">

4
packages/vulcan-core/lib/modules/containers/withList.js
View file

@ -203,7 +203,9 @@ const queryReducer = (previousResults, action, collection, mergedTerms, listReso
let newResults = previousResults;
// get mongo selector and options objects based on current terms
const { selector, options } = collection.getParameters(mergedTerms, apolloClient);
const result = collection.getParameters(mergedTerms, apolloClient);
const { selector, options } = result;
const mingoQuery = Mingo.Query(selector);
// function to remove a document from a results object, used by edit and remove cases below

10
packages/vulcan-lib/lib/modules/collections.js
View file

@ -197,12 +197,20 @@ export const createCollection = options => {
// handle view option
if (terms.view && collection.views[terms.view]) {
const view = collection.views[terms.view];
parameters = Utils.deepExtend(true, parameters, view(terms, apolloClient));
parameters = Utils.deepExtend(true, parameters, view(terms, apolloClient, context));
}
// iterate over posts.parameters callbacks
parameters = runCallbacks(`${collectionName.toLowerCase()}.parameters`, parameters, _.clone(terms), apolloClient, context);
if (Meteor.isClient) {
parameters = runCallbacks(`${collectionName.toLowerCase()}.parameters.client`, parameters, _.clone(terms), apolloClient);
}
if (Meteor.isServer) {
parameters = runCallbacks(`${collectionName.toLowerCase()}.parameters.server`, parameters, _.clone(terms), context);
}
// extend sort to sort posts by _id to break ties, unless there's already an id sort
// NOTE: always do this last to avoid overriding another sort
if (!(parameters.options.sort && parameters.options.sort._id)) {