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 w2p-61493_Configurable-entities-master-merge

Browse Source 
Conflicts:
	src/app/+item-page/item-page.module.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.ts
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-page.module.ts
	src/app/core/shared/dspace-object.model.ts
	src/app/core/shared/item.model.ts
	src/app/core/shared/metadata.models.ts
	src/app/core/shared/resource-type.ts
	src/app/shared/services/route.service.spec.ts
	src/app/shared/services/route.service.ts
	src/app/thumbnail/thumbnail.component.html
This commit is contained in:
Kristof De Langhe
2019-04-01 15:52:53 +02:00
parent 8996716d71 f54a3a4d6b
commit 9766a65c3a
419 changed files with 26843 additions and 2191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/app/core/shared/dspace-object.model.ts
View File

@@ -1,15 +1,12 @@
import {
MetadataMap,
MetadataValue,
MetadataValueFilter,
MetadatumViewModel
} from './metadata.models';
import { Observable } from 'rxjs';
import { MetadataMap, MetadataValue, MetadataValueFilter, MetadatumViewModel } from './metadata.models';
import { Metadata } from './metadata.utils';
import { isUndefined } from '../../shared/empty.util';
import { CacheableObject } from '../cache/object-cache.reducer';
import { RemoteData } from '../data/remote-data';
import { ResourceType } from './resource-type';
import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
import { Observable } from 'rxjs';
import { hasNoValue } from '../../shared/empty.util';
/**
@@ -17,6 +14,8 @@ import { hasNoValue } from '../../shared/empty.util';
*/
export class DSpaceObject implements CacheableObject, ListableObject {
private _name: string;
self: string;
/**
@@ -38,7 +37,14 @@ export class DSpaceObject implements CacheableObject, ListableObject {
* The name for this DSpaceObject
*/
get name(): string {
return this.firstMetadataValue('dc.title');
return (isUndefined(this._name)) ? this.firstMetadataValue('dc.title') : this._name;
}
/**
* The name for this DSpaceObject
*/
set name(name) {
this._name = name;
}
/**