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

solved issues after merge

Browse Source
This commit is contained in:
lotte
2019-08-27 16:48:18 +02:00
parent 4d67c98f04
commit 89be29ad7f
14 changed files with 62 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/submission/sections/form/section-form.component.ts
View File

@@ -31,7 +31,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
import { SectionsService } from '../sections.service';
import { difference } from '../../../shared/object.util';
import { WorkspaceitemSectionFormObject } from '../../../core/submission/models/workspaceitem-section-form.model';
import { Workspaceitem } from '../../../core/submission/models/workspaceitem.model';
import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
import { combineLatest as combineLatestObservable } from 'rxjs';
import { getSucceededRemoteData } from '../../../core/shared/operators';
@@ -102,7 +102,7 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
*/
protected subs: Subscription[] = [];
protected workspaceItem: Workspaceitem;
protected workspaceItem: WorkspaceItem;
/**
* The FormComponent reference
*/
@@ -154,10 +154,10 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
flatMap(() =>
combineLatestObservable(
this.sectionService.getSectionData(this.submissionId, this.sectionData.id),
this.workspaceItemDataService.findById(this.submissionId).pipe(getSucceededRemoteData(), map((wsiRD: RemoteData<Workspaceitem>) => wsiRD.payload))
this.workspaceItemDataService.findById(this.submissionId).pipe(getSucceededRemoteData(), map((wsiRD: RemoteData<WorkspaceItem>) => wsiRD.payload))
)),
take(1))
.subscribe(([sectionData, workspaceItem]: [WorkspaceitemSectionFormObject, Workspaceitem]) => {
.subscribe(([sectionData, workspaceItem]: [WorkspaceitemSectionFormObject, WorkspaceItem]) => {
if (isUndefined(this.formModel)) {
this.sectionData.errors = [];
// Is the first loading so init form