Merge pull request #2240 from dpalou/MOBILE-3267

MOBILE-3267 more: Filter site name in more tab
main
Juan Leyva 2020-01-22 16:30:47 +01:00 committed by GitHub
commit b35eabc710
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View File

@ -8,7 +8,7 @@
<a ion-item core-user-link [userId]="siteInfo.userid" text-wrap>
<ion-avatar core-user-avatar [user]="siteInfo" item-start></ion-avatar>
<h2>{{siteInfo.fullname}}</h2>
<ion-note>{{ siteName }}</ion-note>
<ion-note><core-format-text [text]="siteName" contextLevel="system" [contextInstanceId]="0" [wsNotFiltered]="true"></core-format-text></ion-note>
<ion-note>{{ siteUrl }}</ion-note>
</a>
<ion-item-divider></ion-item-divider>

View File

@ -413,7 +413,8 @@ export class CoreFormatTextDirective implements OnChanges {
this.contextInstanceId = site.getSiteHomeId();
}
this.filter = typeof this.filter == 'undefined' ? !!(this.contextLevel && this.contextInstanceId) : !!this.filter;
this.filter = typeof this.filter == 'undefined' ?
!!(this.contextLevel && typeof this.contextInstanceId != 'undefined') : !!this.filter;
result.options = {
clean: this.utils.isTrueOrOne(this.clean),