Fix rebase issues

This commit is contained in:
Yana De Pauw
2020-05-28 10:34:03 +02:00
parent bca1e8bdd4
commit 8fc2309d48
4 changed files with 7 additions and 10 deletions

View File

@@ -9,11 +9,11 @@ import { TranslateService } from '@ngx-translate/core';
import { EPersonDataService } from '../../core/eperson/eperson-data.service';
import { EPerson } from '../../core/eperson/models/eperson.model';
import { LangConfig } from '../../../config/lang-config.interface';
import { GLOBAL_CONFIG, GlobalConfig } from '../../../config';
import { Store } from '@ngrx/store';
import { CoreState } from '../../core/core.reducers';
import { AuthenticateAction } from '../../core/auth/auth.actions';
import { NotificationsService } from '../../shared/notifications/notifications.service';
import { environment } from '../../../environments/environment';
/**
* Component that renders the create profile page to be used by a user registering through a token
@@ -33,7 +33,6 @@ export class CreateProfileComponent implements OnInit {
activeLangs: LangConfig[];
constructor(
@Inject(GLOBAL_CONFIG) public config: GlobalConfig,
private translateService: TranslateService,
private ePersonDataService: EPersonDataService,
private store: Store<CoreState>,
@@ -53,7 +52,7 @@ export class CreateProfileComponent implements OnInit {
this.email = registration.email;
this.token = registration.token;
});
this.activeLangs = this.config.languages.filter((MyLangConfig) => MyLangConfig.active === true);
this.activeLangs = environment.languages.filter((MyLangConfig) => MyLangConfig.active === true);
this.userInfoForm = this.formBuilder.group({
firstName: new FormControl('', {