Skip to content

Commit

Permalink
Merge pull request #808 from Badsender-com/disable-tags
Browse files Browse the repository at this point in the history
Disable tags call and filter in mailings-filters.vue component
  • Loading branch information
FlorianGille committed Jul 11, 2024
2 parents b992967 + 5103ce0 commit fcf6da2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
8 changes: 3 additions & 5 deletions packages/server/mailing/mailing.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -459,12 +459,10 @@ async function bulkUpdate(req, res) {
return mailing.save();
});
await Promise.all(updateQueries);
const [mailings, tags] = await Promise.all([
Mailings.findForApi(mailingQuery),
Mailings.findTags(modelsUtils.addStrictGroupFilter(req.user, {})),
]);
const mailings = await Mailings.findForApi(mailingQuery);

res.json({
meta: { tags },
meta: { tags: [] },
items: mailings,
});
}
Expand Down
4 changes: 1 addition & 3 deletions packages/server/mailing/mailing.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,8 @@ async function listMailingForWorkspaceOrFolder({
});
}

const tags = await findTags({ user });

return {
meta: { tags },
meta: { tags: [] },
items: mailings,
};
}
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/routes/mailings/__partials/mailings-filters.vue
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,13 @@ export default {
multiple
@input="(value) => handleFilterChange('templates', value)"
/>
<v-select
<!-- <v-select
:value="filters.tags"
:label="$t(`global.tags`)"
:items="tags"
multiple
@input="(value) => handleFilterChange('tags', value)"
/>
/> -->
<div class="bs-mailings-filters__date-picker">
<v-menu
v-model="pickerCreatedStart"
Expand Down

0 comments on commit fcf6da2

Please sign in to comment.