Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

EDERCMS-245 Only add global items that have section "overall" #182

Merged
merged 1 commit into from
Oct 21, 2024
Merged

EDERCMS-245 Only add global items that have section "overall" #182

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions scripts/list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,15 +321,20 @@ async function fetchListItemsForTenant(listType, tenant) {
* @param {String} listType
* @param {Array} tenants
* @param {Array} [preloadedItems]
* @param {Function} [filter]
* @returns {Promise<Array>}
*/
async function fetchTenantsListItems(listType, tenants, preloadedItems) {
async function fetchTenantsListItems(listType, tenants, preloadedItems, filter) {
let items = preloadedItems || [];
const tenantPromises = tenants
.map((tenant) => fetchListItemsForTenant(listType, tenant)
.then((tenantItems) => {
let filteredItems = tenantItems;
// add to list
items = items.concat(tenantItems);
if (filter) {
filteredItems = filteredItems.filter(filter);
}
items = items.concat(filteredItems);
}));

// sort accumulated items
Expand Down Expand Up @@ -430,6 +435,9 @@ async function decorateList(container, config, listType, renderer, itemManipulat
listType,
[defaultTenant],
await fetchListItems(listType),
(item) => item.section.toLowerCase().split(',').some(
(s) => ['überall', 'overall', 'global'].includes(s.trim()),
),
dmorbitzer marked this conversation as resolved.
Show resolved Hide resolved
);
} else {
items = await fetchListItems(listType);
Expand Down