hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 07:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into w2p-67478_Search-external-sources-in-submission

Browse Source 
Conflicts:
	src/app/core/data/data.service.ts
	src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
This commit is contained in:
Kristof De Langhe
2020-01-14 12:46:55 +01:00
parent 890d60aa9c 6e928eeb89
commit 4ba3b01997
140 changed files with 5747 additions and 1631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/core/data/lookup-relation.service.ts
View File

@@ -61,7 +61,7 @@ export class LookupRelationService {
concat(subject.pipe(take(1)))
)
) as any
)
) as Observable<RemoteData<PaginatedList<SearchResult<Item>>>>;
}
/**