Skip to content

Commit 3784db4

Browse files
committed
Merge remote-tracking branch 'bitbucket4science/task/dspace-cris-2024_02_x/DSC-2506' into task/dspace-cris-2024_02_x/DSC-2506
2 parents 9f4fc9a + d9fa397 commit 3784db4

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

src/app/app-routes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ export const APP_ROUTES: Route[] = [
171171
path: ADMIN_MODULE_PATH,
172172
loadChildren: () => import('./admin/admin-routes')
173173
.then((m) => m.ROUTES),
174-
canActivate: [endUserAgreementCurrentUserGuard],
174+
canActivate: [authenticatedGuard, endUserAgreementCurrentUserGuard],
175175
},
176176
{
177177
path: NOTIFICATIONS_MODULE_PATH,

src/app/core/itemexportformat/item-export-format.service.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,10 @@ export class ItemExportFormatService extends IdentifiableDataService<ItemExportF
200200
.filter((searchFilter) => searchFilter.key.includes('f.'))
201201
.map((searchFilter) => {
202202
const key = searchFilter.key.replace('f.', '');
203-
return searchFilter.values.map((filterValue) => `${key}=${filterValue}`).join('&');
203+
return searchFilter.values.map((filterValue) => {
204+
const baseValue = `${key}=${filterValue}`;
205+
return searchFilter.operator ? `${baseValue},${searchFilter.operator}` : baseValue;
206+
}).join('&');
204207
})
205208
.join('&');
206209
return [...parameterValues, Object.assign(new ProcessParameter(), { name: '-sf', value })];

0 commit comments

Comments
 (0)