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.selectedUnreadUserSeqs = [];
|
||||||
this.rightDrawer.close();
|
this.rightDrawer.close();
|
||||||
} else {
|
} 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!');
|
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-title">DS Talk</div>
|
||||||
<div class="app-layout-native-title-bar-spacer"></div>
|
<div class="app-layout-native-title-bar-spacer"></div>
|
||||||
<div class="btn-area">
|
<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">
|
<ng-container *ngFor="let link of weblink" [ngSwitch]="link.key">
|
||||||
<button
|
<button
|
||||||
mat-icon-button
|
mat-icon-button
|
||||||
|
|
|
@ -193,7 +193,12 @@ export class TopBarComponent implements OnInit, OnDestroy {
|
||||||
|
|
||||||
if (!!urlInfo && !!urlInfo.webLink) {
|
if (!!urlInfo && !!urlInfo.webLink) {
|
||||||
// order by webLinkAllowedList..
|
// order by webLinkAllowedList..
|
||||||
this.weblink = urlInfo.webLinkAllowedList.map(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)
|
urlInfo.webLink.find(weblink => weblink.key === showWeblink)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user