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

Merge branch 'community-and-collection-forms' into w2p-58522_delete-collections-and-communities

Browse Source 
Conflicts:
	src/app/core/data/data.service.ts
	src/app/shared/shared.module.ts
This commit is contained in:
lotte
2019-01-24 12:58:05 +01:00
parent f0cc24ff9b c4004eaaa2
commit a733eb5834
81 changed files with 2424 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/core/data/dspace-object-data.service.ts
View File

@@ -13,8 +13,8 @@ import { FindAllOptions } from './request.models';
import { ObjectCacheService } from '../cache/object-cache.service';
import { NotificationsService } from '../../shared/notifications/notifications.service';
import { HttpClient } from '@angular/common/http';
import { DataBuildService } from '../cache/builders/data-build.service';
import { DSOUpdateComparator } from './dso-update-comparator';
import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
/* tslint:disable:max-classes-per-file */
class DataServiceImpl extends DataService<NormalizedDSpaceObject, DSpaceObject> {
@@ -23,13 +23,13 @@ class DataServiceImpl extends DataService<NormalizedDSpaceObject, DSpaceObject>
constructor(
protected requestService: RequestService,
protected rdbService: RemoteDataBuildService,
protected dataBuildService: DataBuildService,
protected dataBuildService: NormalizedObjectBuildService,
protected store: Store<CoreState>,
protected objectCache: ObjectCacheService,
protected halService: HALEndpointService,
protected notificationsService: NotificationsService,
protected http: HttpClient,
protected comparator: DSOUpdateComparator) {
protected comparator: DSOChangeAnalyzer) {
super();
}
@@ -50,12 +50,12 @@ export class DSpaceObjectDataService {
constructor(
protected requestService: RequestService,
protected rdbService: RemoteDataBuildService,
protected dataBuildService: DataBuildService,
protected dataBuildService: NormalizedObjectBuildService,
protected objectCache: ObjectCacheService,
protected halService: HALEndpointService,
protected notificationsService: NotificationsService,
protected http: HttpClient,
protected comparator: DSOUpdateComparator) {
protected comparator: DSOChangeAnalyzer) {
this.dataService = new DataServiceImpl(requestService, rdbService, dataBuildService, null, objectCache, halService, notificationsService, http, comparator);
}