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

Merge branch 'main' into w2p-72699_Hard-redirect-after-log-in

Browse Source 
Conflicts:
	src/app/app-routing.module.ts
	src/app/shared/log-in/log-in.component.ts
This commit is contained in:
Kristof De Langhe
2020-09-03 13:19:36 +02:00
parent e9a2b4b368 cd6c5b70c8
commit 3d08eb0ae1
111 changed files with 561 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/shared/log-in/log-in.component.ts
View File

@@ -9,7 +9,7 @@ import {
isAuthenticationLoading
} from '../../core/auth/selectors';
import { CoreState } from '../../core/core.reducers';
import { getForgotPasswordPath, getRegisterPath } from '../../app-routing.module';
import { getForgotPasswordRoute, getRegisterRoute } from '../../app-routing-paths';
import { hasValue } from '../empty.util';
import { AuthService } from '../../core/auth/auth.service';
@@ -72,11 +72,11 @@ export class LogInComponent implements OnInit {
});
}
getRegisterPath() {
return getRegisterPath();
getRegisterRoute() {
return getRegisterRoute();
}
getForgotPath() {
return getForgotPasswordPath();
getForgotRoute() {
return getForgotPasswordRoute();
}
}