diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index f3da29159..f85873c95 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -30,6 +30,7 @@ export class GroupMessagesPage implements OnInit, OnChanges { @Output() closeAllDesktopComponents:EventEmitter = new EventEmitter(); @Output() showEmptyContainer:EventEmitter = new EventEmitter(); @Output() openGroupContacts:EventEmitter = new EventEmitter(); + @Output() openEditGroup:EventEmitter = new EventEmitter(); constructor( private menu: MenuController, @@ -208,6 +209,9 @@ export class GroupMessagesPage implements OnInit, OnChanges { else if(res.data == 'cancel'){ console.log('CANCEL'); } + else if(res.data == 'edit'){ + console.log('CANCEL'); + } else{ this.roomName = res.data.name.split('-').join(' '); console.log(this.roomName); diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts index d04851177..297c2af33 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.ts +++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts @@ -40,7 +40,7 @@ export class ChatPopoverPage implements OnInit { leaveGroup(){ console.log('leave'); - /* let body = { "roomId":this.roomId, } + let body = { "roomId":this.roomId, } this.chatService.getRoomInfo(this.roomId).subscribe(room=>{ this.room = room['room']; @@ -55,7 +55,7 @@ export class ChatPopoverPage implements OnInit { console.log(res); }); } - }); */ + }); this.modalController.dismiss('leave'); } //Delete @@ -79,7 +79,8 @@ export class ChatPopoverPage implements OnInit { } async openChangeGroupName(){ - const modal = await this.modalController.create({ + this.modalController.dismiss('edit'); + /* const modal = await this.modalController.create({ component: EditGroupPage, componentProps: { //room: this.room, @@ -92,7 +93,7 @@ export class ChatPopoverPage implements OnInit { modal.onDidDismiss().then((res)=>{ console.log(res.data); this.modalController.dismiss(res.data); - }); + }); */ } }