GuzhavinAleksey/Vmeda.Online
1
0
Fork 0
forked from CIT/Vmeda.Online
Code Pull Requests Activity

Merge pull request #1390 from albertgasset/MOBILE-2451

Browse Source 
MOBILE-2451 user: Do not show error in profile of deleted users
This commit is contained in:
Juan Leyva 2018-07-04 10:52:48 +02:00 committed by GitHub
commit c6b4d618c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/user/pages/profile/profile.ts
View File

@ -43,7 +43,7 @@ export class CoreUserProfilePage {
userLoaded = false; userLoaded = false;
isLoadingHandlers = false; isLoadingHandlers = false;
user: any = {}; user: any;
title: string; title: string;
isDeleted = false; isDeleted = false;
canChangeProfilePicture = false; canChangeProfilePicture = false;
@ -71,7 +71,7 @@ export class CoreUserProfilePage {
!this.userProvider.isUpdatePictureDisabledInSite(this.site); !this.userProvider.isUpdatePictureDisabledInSite(this.site);
this.obsProfileRefreshed = eventsProvider.on(CoreUserProvider.PROFILE_REFRESHED, (data) => { this.obsProfileRefreshed = eventsProvider.on(CoreUserProvider.PROFILE_REFRESHED, (data) => {
if (typeof data.user != 'undefined') { if (this.user && typeof data.user != 'undefined') {
this.user.email = data.user.email; this.user.email = data.user.email;
this.user.address = this.userHelper.formatAddress('', data.user.city, data.user.country); this.user.address = this.userHelper.formatAddress('', data.user.city, data.user.country);
} }
@ -126,7 +126,10 @@ export class CoreUserProfilePage {
}); });
}).catch((error) => { }).catch((error) => {
this.domUtils.showErrorModalDefault(error, 'core.user.errorloaduser', true); // Error is null for deleted users, do not show the modal.
if (error) {
this.domUtils.showErrorModal(error);
}
}); });
} }