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

Merge branch 'master' into w2p-46063_truncation-implementation

Browse Source 
Conflicts:
	src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts
	src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts
	src/app/shared/object-grid/item-grid-element/item-grid-element.component.spec.ts
	src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
	src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
	src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.spec.ts
This commit is contained in:
Lotte Hofstede
2018-02-13 15:51:30 +01:00
parent c9071bc067 fe9150c0fc
commit 7c873905e8
40 changed files with 2485 additions and 1256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.ts
View File

@@ -1,8 +1,8 @@
import { Component, Input, Injector, ReflectiveInjector, OnInit } from '@angular/core';
import { Component, Injector, Input, OnInit } from '@angular/core';
import { ViewMode } from '../../../+search-page/search-options.model';
import { GenericConstructor } from '../../../core/shared/generic-constructor';
import { rendersDSOType } from '../../object-collection/shared/dso-element-decorator';
import { ListableObject } from '../../object-collection/shared/listable-object.model';
import { ViewMode } from '../../../+search-page/search-options.model';
@Component({
selector: 'ds-wrapper-grid-element',
@@ -13,11 +13,14 @@ export class WrapperGridElementComponent implements OnInit {
@Input() object: ListableObject;
objectInjector: Injector;
constructor(private injector: Injector) {}
constructor(private injector: Injector) {
}
ngOnInit(): void {
this.objectInjector = ReflectiveInjector.resolveAndCreate(
[{provide: 'objectElementProvider', useFactory: () => (this.object) }], this.injector);
this.objectInjector = Injector.create({
providers: [{ provide: 'objectElementProvider', useFactory: () => (this.object), deps:[] }],
parent: this.injector
});
}