From 5d687aa61672db0e7f6ec4ea00365996b8883a83 Mon Sep 17 00:00:00 2001 From: leejinho Date: Fri, 17 Jan 2020 11:31:15 +0900 Subject: [PATCH] =?UTF-8?q?=ED=94=84=EB=A1=9C=ED=95=84=20=ED=8C=9D?= =?UTF-8?q?=EC=97=85=EC=97=90=20=EB=8F=99=EB=A3=8C=20=ED=95=B8=EB=93=A4?= =?UTF-8?q?=EB=A7=81=20=EB=B2=84=ED=8A=BC=20=ED=99=9C=EC=84=B1=ED=99=94=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.=20=EA=B7=B8=EB=A3=B9=20>=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=20>=20=ED=94=84=EB=A1=9C=ED=95=84=20=EC=98=A4?= =?UTF-8?q?=ED=94=88=20>=20=EB=8F=99=EB=A3=8C=EC=B6=94=EA=B0=80,=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=EB=B2=84=ED=8A=BC=20=ED=95=B8=EB=93=A4=EB=A7=81=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../left-sidenav/group.component.ts | 49 ++++++++----------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts index fb1be996..89a2aa32 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.ts @@ -481,20 +481,7 @@ export class GroupComponent implements OnInit, OnDestroy { ); switch (menuType) { case 'VIEW_PROFILE': - let useBuddyButton = false; - if ( - !!group && - environment.productConfig.CommonSetting.useMyDeptGroup && - environment.productConfig.CommonSetting.myDeptGroupSeq !== group.seq - ) { - useBuddyButton = true; - } - this.openProfile.emit({ - userSeq: userInfo.seq, - openProfileOptions: { - useBuddyButton - } - }); + this.onClickOpenProfile(userInfo.seq, group); break; case 'CHAT': this.onSelectBuddy(userInfo); @@ -630,21 +617,27 @@ export class GroupComponent implements OnInit, OnDestroy { } onClickOpenProfile(userSeq: number, group: GroupDetailData) { - let useBuddyButton = false; - if ( - !!group && - environment.productConfig.CommonSetting.useMyDeptGroup && - environment.productConfig.CommonSetting.myDeptGroupSeq !== group.seq - ) { - useBuddyButton = true; - } - - this.openProfile.emit({ - userSeq, - openProfileOptions: { - useBuddyButton + if (this.isShowSearch) { + this.openProfile.emit({ + userSeq + }); + } else { + let useBuddyButton = false; + if ( + !!group && + environment.productConfig.CommonSetting.useMyDeptGroup && + environment.productConfig.CommonSetting.myDeptGroupSeq !== group.seq + ) { + useBuddyButton = true; } - }); + + this.openProfile.emit({ + userSeq, + openProfileOptions: { + useBuddyButton + } + }); + } } onContextMenuProfile(