Skip to content

Commit fa01299

Browse files
committed
Merge branch 'dspace-cris-2023_02_x' into dspace-cris-2024_02_x
# Conflicts: # src/app/app-routing.module.ts # src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/thumbnail/thumbnail.component.ts # src/app/shared/log-in/log-in.component.spec.ts # src/app/shared/log-in/log-in.component.ts # src/config/default-app-config.ts
2 parents 7ac0ee9 + 502f6c0 commit fa01299

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

src/app/shared/log-in/log-in.component.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,7 @@ export class LogInComponent implements OnInit, OnDestroy {
155155

156156
this.canForgot$ = this.authorizationService.isAuthorized(FeatureID.EPersonForgotPassword).pipe(shareReplay({ refCount: false, bufferSize: 1 }));
157157
this.canShowDivider$ = this.canRegister$.pipe(
158-
combineLatestWith(this.canForgot$)
159-
,
158+
combineLatestWith(this.canForgot$),
160159
map(([canRegister, canForgot]) => canRegister || canForgot),
161160
filter(Boolean),
162161
);

src/app/shared/metadata-link-view/metadata-link-view-avatar-popover/metadata-link-view-avatar-popover.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import {
1111
import { TranslateModule } from '@ngx-translate/core';
1212
import { Observable } from 'rxjs';
1313
import { ThumbnailComponent } from 'src/app/thumbnail/thumbnail.component';
14+
import { getDefaultImageUrlByEntityType } from '../../../core/shared/image.utils';
15+
import { Observable } from 'rxjs';
1416

1517
import { getDefaultImageUrlByEntityType } from '../../../core/shared/image.utils';
1618
import { ThemedLoadingComponent } from '../../loading/themed-loading.component';

0 commit comments

Comments
 (0)