reviewable/pr3634/r1
Lauri Ojansivu 4 years ago
parent 3605072650
commit 0aabb0b364
  1. 2
      client/components/main/globalSearch.js
  2. 2
      models/settings.js
  3. 2
      models/usersessiondata.js
  4. 4
      server/publications/cards.js

@ -654,7 +654,7 @@ BlazeComponent.extendComponent({
[
'globalSearch-instructions-operator-has',
'globalSearch-instructions-operator-sort',
'globalSearch-instructions-operator-limit'
'globalSearch-instructions-operator-limit',
].forEach(instruction => {
text += `\n* ${TAPi18n.__(instruction, tags)}`;
});

@ -153,7 +153,7 @@ if (Meteor.isServer) {
// At Sandstorm, Admin Panel has SMTP settings
const newSetting = Settings.findOne();
if (!process.env.MAIL_URL && newSetting.mailUrl())
process.env.MAIL_URL = newSetting.mailUrl();
process.env.MAIL_URL = newSetting.mailUrl();
Accounts.emailTemplates.from = process.env.MAIL_FROM
? process.env.MAIL_FROM
: newSetting.mailServer.from;

@ -184,7 +184,7 @@ function pickleValue(value) {
if (value === null) {
return null;
} else if (typeof value === 'object') {
switch(value.constructor.name) {
switch (value.constructor.name) {
case 'RegExp':
return {
$$class: 'RegExp',

@ -521,7 +521,9 @@ Meteor.publish('globalSearch', function(sessionId, queryParams) {
switch (has.field) {
case 'attachment':
const attachments = Attachments.find({}, { fields: { cardId: 1 } });
selector.$and.push({ _id: { $in: attachments.map(a => a.cardId) } });
selector.$and.push({
_id: { $in: attachments.map(a => a.cardId) },
});
break;
case 'checklist':
const checklists = Checklists.find({}, { fields: { cardId: 1 } });

Loading…
Cancel
Save