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

Merge remote-tracking branch 'dspace/master' into w2p-65240_Community-and-collection-logos-2

Browse Source 
# Conflicts:
#	src/app/+collection-page/collection-page.component.html
#	src/app/core/data/comcol-data.service.ts
This commit is contained in:
Philip Vissenaekens
2019-12-12 13:08:38 +01:00
parent 7755228b59 a78e0512cb
commit 9a921e9311
150 changed files with 3804 additions and 774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/submission/form/submission-form.component.ts
View File

@@ -1,7 +1,7 @@
import { ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
import { of as observableOf, Observable, Subscription } from 'rxjs';
import { distinctUntilChanged, filter, flatMap, map } from 'rxjs/operators';
import { distinctUntilChanged, filter, flatMap, map, switchMap } from 'rxjs/operators';
import { hasValue, isNotEmpty } from '../../shared/empty.util';
import { SubmissionObjectEntry } from '../objects/submission-objects.reducer';
@@ -120,7 +120,7 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
map((submission: SubmissionObjectEntry) => submission.isLoading),
map((isLoading: boolean) => isLoading),
distinctUntilChanged(),
flatMap((isLoading: boolean) => {
switchMap((isLoading: boolean) => {
if (!isLoading) {
return this.getSectionsList();
} else {