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

Merge branch 'master' into clean-relationships-in-submission

Browse Source
This commit is contained in:
lotte
2019-11-29 08:52:10 +01:00
parent 16a16bedfe 7f44c7751b
commit d1ba3d9936
51 changed files with 1732 additions and 1939 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/core/core.module.ts
View File

@@ -129,11 +129,11 @@ import {
} from './dspace-rest-v2/mocks/mock-response-map';
import { EndpointMockingRestService } from './dspace-rest-v2/endpoint-mocking-rest.service';
import { ENV_CONFIG, GLOBAL_CONFIG, GlobalConfig } from '../../config';
import { SearchSidebarService } from './shared/search/search-sidebar.service';
import { SearchFilterService } from './shared/search/search-filter.service';
import { SearchConfigurationService } from './shared/search/search-configuration.service';
import { SelectableListService } from '../shared/object-list/selectable-list/selectable-list.service';
import { RelationshipTypeService } from './data/relationship-type.service';
import { SidebarService } from '../shared/sidebar/sidebar.service';
export const restServiceFactory = (cfg: GlobalConfig, mocks: MockResponseMap, http: HttpClient) => {
if (ENV_CONFIG.production) {
@@ -234,7 +234,7 @@ const PROVIDERS = [
ClaimedTaskDataService,
PoolTaskDataService,
SearchService,
SearchSidebarService,
SidebarService,
SearchFilterService,
SearchFilterService,
SearchConfigurationService,