Skip to content

Commit c75856f

Browse files
committed
Merge branch 'task/dspace-cris-2023_02_x/DSC-2454' into task/dspace-cris-2024_02_x/DSC-2454
# Conflicts: # src/app/app.component.spec.ts # src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/metadata-container/metadata-container.component.spec.ts # src/app/shared/log-in/log-in.component.ts
2 parents ac0a14b + 4bb2685 commit c75856f

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/metadata-container/metadata-container.component.spec.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,8 @@ describe('MetadataContainerComponent', () => {
328328
testItem.uuid,
329329
bitstreamField.bitstream.bundle,
330330
[ { metadataName: 'metadataFieldTest', metadataValue: 'metadataValueTest' } ],
331+
{},
332+
false
331333
);
332334
});
333335
});
@@ -342,7 +344,9 @@ describe('MetadataContainerComponent', () => {
342344
expect(mockBitstreamDataService.findShowableBitstreamsByItem).toHaveBeenCalledWith(
343345
testItem.uuid,
344346
bitstreamField.bitstream.bundle,
345-
[], // <--- empty array of filters
347+
[], // <--- empty array of filters,
348+
{},
349+
false
346350
);
347351
});
348352
});

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/metadata-container/metadata-container.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ export class MetadataContainerComponent implements OnInit {
181181
metadataValue: this.field.bitstream.metadataValue,
182182
});
183183
}
184-
return this.bitstreamDataService.findShowableBitstreamsByItem(this.item.uuid, this.field.bitstream.bundle, filters)
184+
return this.bitstreamDataService.findShowableBitstreamsByItem(this.item.uuid, this.field.bitstream.bundle, filters, {}, false)
185185
.pipe(
186186
getFirstCompletedRemoteData(),
187187
map((response: RemoteData<PaginatedList<Bitstream>>) => {

0 commit comments

Comments
 (0)