1. 쪽지 발송 취소 실패시 에러메시지 출력
2, 웹링크 allow 와 실제 url 이 매칭되지 않을때 발생하는 문제점 수정.
This commit is contained in:
parent
39583f26a6
commit
3454b11122
|
@ -609,6 +609,15 @@ export class MessageDetailDialogComponent implements OnInit {
|
|||
this.selectedUnreadUserSeqs = [];
|
||||
this.rightDrawer.close();
|
||||
} else {
|
||||
this.snackBarService.open(
|
||||
this.translateService.instant('chat.error.cancelledError'),
|
||||
this.translateService.instant('common.messages.confirm'),
|
||||
{
|
||||
duration: 3000,
|
||||
verticalPosition: 'bottom',
|
||||
horizontalPosition: 'center'
|
||||
}
|
||||
);
|
||||
this.logger.error('message cancel user Error!');
|
||||
}
|
||||
}),
|
||||
|
|
|
@ -5,7 +5,10 @@
|
|||
<div class="app-layout-native-title-bar-title">DS Talk</div>
|
||||
<div class="app-layout-native-title-bar-spacer"></div>
|
||||
<div class="btn-area">
|
||||
<div *ngIf="!!loginRes" class="app-layout-native-title-bar-link">
|
||||
<div
|
||||
*ngIf="!!loginRes && !!weblink"
|
||||
class="app-layout-native-title-bar-link"
|
||||
>
|
||||
<ng-container *ngFor="let link of weblink" [ngSwitch]="link.key">
|
||||
<button
|
||||
mat-icon-button
|
||||
|
|
|
@ -193,9 +193,14 @@ export class TopBarComponent implements OnInit, OnDestroy {
|
|||
|
||||
if (!!urlInfo && !!urlInfo.webLink) {
|
||||
// order by webLinkAllowedList..
|
||||
this.weblink = urlInfo.webLinkAllowedList.map(showWeblink =>
|
||||
urlInfo.webLink.find(weblink => weblink.key === showWeblink)
|
||||
);
|
||||
this.weblink = urlInfo.webLinkAllowedList
|
||||
.filter(
|
||||
showWebLink =>
|
||||
urlInfo.webLink.filter(wl => wl.key === showWebLink).length > 0
|
||||
)
|
||||
.map(showWeblink =>
|
||||
urlInfo.webLink.find(weblink => weblink.key === showWeblink)
|
||||
);
|
||||
|
||||
if (urlInfo.webLinkAllowedList.indexOf(WebLinkType.Mail) > -1) {
|
||||
// 메일 카운트 체크.
|
||||
|
|
Loading…
Reference in New Issue
Block a user