fixed issues after merging

This commit is contained in:
lotte
2019-05-27 15:09:51 +02:00
parent a0a0830e5f
commit 35f73708ef
7 changed files with 148 additions and 80 deletions

View File

@@ -31,6 +31,20 @@ export class NormalizedClaimedTask extends NormalizedTaskObject<ClaimedTask> {
@autoserialize
action: string;
/**
* The eperson object for this task
*/
@autoserialize
@relationship(ResourceType.EPerson, false)
eperson: string;
/**
* The group object for this task
*/
@autoserialize
@relationship(ResourceType.Group, false)
group: string;
/**
* The workflowitem object whom this task is related
*/

View File

@@ -31,6 +31,13 @@ export class NormalizedPoolTask extends NormalizedTaskObject<PoolTask> {
@autoserialize
action: string;
/**
* The group object for this task
*/
@autoserialize
@relationship(ResourceType.Group, false)
group: string;
/**
* The workflowitem object whom this task is related
*/

View File

@@ -30,6 +30,20 @@ export abstract class NormalizedTaskObject<T extends DSpaceObject> extends Norma
@autoserialize
action: string;
/**
* The eperson object for this task
*/
@autoserialize
@relationship(ResourceType.EPerson, false)
eperson: string;
/**
* The group object for this task
*/
@autoserialize
@relationship(ResourceType.Group, false)
group: string;
/**
* The workflowitem object whom this task is related
*/

View File

@@ -5,6 +5,8 @@ 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 { Group } from '../../eperson/models/group.model';
import { EPerson } from '../../eperson/models/eperson.model';
/**
* An abstract model class for a TaskObject.
@@ -26,6 +28,16 @@ export class TaskObject extends DSpaceObject implements CacheableObject, Listabl
*/
action: string;
/**
* The group of this task
*/
eperson: Observable<RemoteData<EPerson>>;
/**
* The group of this task
*/
group: Observable<RemoteData<Group>>;
/**
* The workflowitem object whom this task is related
*/