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

Merge remote-tracking branch 'templates/dspace-7.6' into fix-display-order-authentication-methods_contribute-7.6

Browse Source 
# Conflicts:
#	src/app/shared/log-in/log-in.component.html
#	src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts
#	src/app/shared/log-in/methods/oidc/log-in-oidc.component.html
#	src/app/shared/log-in/methods/oidc/log-in-oidc.component.spec.ts
#	src/app/shared/log-in/methods/orcid/log-in-orcid.component.html
#	src/app/shared/log-in/methods/password/log-in-password.component.ts
#	src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.html
#	src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.spec.ts
This commit is contained in:
Alexandre Vryghem
2023-08-02 20:59:36 +02:00
parent 71cf66ecf4 404ccd9b0e
commit 94ceee9080
1612 changed files with 101058 additions and 52199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/shared/log-in/methods/password/log-in-password.component.ts
View File

@@ -1,6 +1,6 @@
import { map } from 'rxjs/operators';
import { Component, Inject, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { select, Store } from '@ngrx/store';
import { Observable } from 'rxjs';
@@ -66,7 +66,7 @@ export class LogInPasswordComponent implements OnInit {
* The authentication form.
* @type {FormGroup}
*/
public form: FormGroup;
public form: UntypedFormGroup;
/**
* Whether the current user (or anonymous) is authorized to register an account
@@ -78,7 +78,7 @@ export class LogInPasswordComponent implements OnInit {
@Inject('isStandalonePage') public isStandalonePage: boolean,
private authService: AuthService,
private hardRedirectService: HardRedirectService,
private formBuilder: FormBuilder,
private formBuilder: UntypedFormBuilder,
protected store: Store<CoreState>,
protected authorizationService: AuthorizationDataService,
) {