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

61949: merged master, resolving conflicts

Browse Source
This commit is contained in:
lotte
2019-05-24 16:57:38 +02:00
parent 233909d6ca
commit a0a0830e5f
41 changed files with 130 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/core/tasks/models/normalized-claimed-task-object.model.ts
View File

@@ -3,11 +3,13 @@ import { mapsTo, relationship } from '../../cache/builders/build-decorators';
import { autoserialize, inheritSerialization } from 'cerialize';
import { ClaimedTask } from './claimed-task-object.model';
import { ResourceType } from '../../shared/resource-type';
import { resourceType } from '../../shared/resource-type.decorator';
/**
* A normalized model class for a ClaimedTask.
*/
@mapsTo(ClaimedTask)
@resourceType(ResourceType.ClaimedTask)
@inheritSerialization(NormalizedTaskObject)
export class NormalizedClaimedTask extends NormalizedTaskObject<ClaimedTask> {
@@ -33,7 +35,7 @@ export class NormalizedClaimedTask extends NormalizedTaskObject<ClaimedTask> {
* The workflowitem object whom this task is related
*/
@autoserialize
@relationship(ResourceType.Workflowitem, false)
@relationship(ResourceType.WorkflowItem, false)
workflowitem: string;
}

4
src/app/core/tasks/models/normalized-pool-task-object.model.ts
View File

@@ -3,11 +3,13 @@ import { PoolTask } from './pool-task-object.model';
import { autoserialize, inheritSerialization } from 'cerialize';
import { mapsTo, relationship } from '../../cache/builders/build-decorators';
import { ResourceType } from '../../shared/resource-type';
import { resourceType } from '../../shared/resource-type.decorator';
/**
* A normalized model class for a PoolTask.
*/
@mapsTo(PoolTask)
@resourceType(ResourceType.PoolTask)
@inheritSerialization(NormalizedTaskObject)
export class NormalizedPoolTask extends NormalizedTaskObject<PoolTask> {
@@ -33,6 +35,6 @@ export class NormalizedPoolTask extends NormalizedTaskObject<PoolTask> {
* The workflowitem object whom this task is related
*/
@autoserialize
@relationship(ResourceType.Workflowitem, false)
@relationship(ResourceType.WorkflowItem, false)
workflowitem: string;
}

2
src/app/core/tasks/models/normalized-task-object.model.ts
View File

@@ -34,6 +34,6 @@ export abstract class NormalizedTaskObject<T extends DSpaceObject> extends Norma
* The workflowitem object whom this task is related
*/
@autoserialize
@relationship(ResourceType.Workflowitem, false)
@relationship(ResourceType.WorkflowItem, false)
workflowitem: string;
}

4
src/app/core/tasks/models/task-object.model.ts
View File

@@ -4,7 +4,7 @@ import { CacheableObject } from '../../cache/object-cache.reducer';
import { DSpaceObject } from '../../shared/dspace-object.model';
import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
import { RemoteData } from '../../data/remote-data';
import { Workflowitem } from '../../submission/models/workflowitem.model';
import { WorkflowItem } from '../../submission/models/workflowitem.model';
/**
* An abstract model class for a TaskObject.
@@ -29,5 +29,5 @@ export class TaskObject extends DSpaceObject implements CacheableObject, Listabl
/**
* The workflowitem object whom this task is related
*/
workflowitem: Observable<RemoteData<Workflowitem>> | Workflowitem;
workflowitem: Observable<RemoteData<WorkflowItem>> | WorkflowItem;
}