diff --git a/app/imports/ui/properties/forms/shared/lists/attributeListMixin.js b/app/imports/ui/properties/forms/shared/lists/attributeListMixin.js index f3b45a24..3ae537ba 100644 --- a/app/imports/ui/properties/forms/shared/lists/attributeListMixin.js +++ b/app/imports/ui/properties/forms/shared/lists/attributeListMixin.js @@ -3,7 +3,7 @@ import createListOfProperties from '/imports/ui/properties/forms/shared/lists/cr const attributeListMixin = { meteor: { attributeList(){ - return createListOfProperties({type: 'attribute'}); + return createListOfProperties({type: {$in: ['attribute', 'skill']}}); }, }, }; diff --git a/app/imports/ui/properties/forms/shared/lists/createListOfProperties.js b/app/imports/ui/properties/forms/shared/lists/createListOfProperties.js index b5e5fef8..7d9bac89 100644 --- a/app/imports/ui/properties/forms/shared/lists/createListOfProperties.js +++ b/app/imports/ui/properties/forms/shared/lists/createListOfProperties.js @@ -15,7 +15,8 @@ export default function createListOfProperties(filter = {}){ }); } } - CreatureProperties.find(filter).forEach(addUniquePropertys); - LibraryNodes.find(filter).forEach(addUniquePropertys); + let options = {sort: {variableName: 1}} + CreatureProperties.find(filter, options).forEach(addUniquePropertys); + LibraryNodes.find(filter, options).forEach(addUniquePropertys); return Array.from(variableNames); }