diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index da629f705..2b1529809 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -546,6 +546,9 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { } else if (res.data == 'edit') { this.editGroup(this.roomId); + } else if (res.data == 'addUser') { + + this.addContacts(); } }); } @@ -820,25 +823,27 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { } async addContacts() { - + if(this.isAdmin) { - const modal = await this.modalController.create({ - component: GroupContactsPage, - componentProps: { - isCreated: this.isGroupCreated, - room: this.room, - members: this.members, - name: this.room.name, - }, - cssClass: 'contacts', - backdropDismiss: false - }); + const modal = await this.modalController.create({ + component: GroupContactsPage, + componentProps: { + isCreated: this.isGroupCreated, + room: this.room, + members: this.members, + name: this.room.name, + }, + cssClass: 'contacts', + backdropDismiss: false + }); + + await modal.present(); + + modal.onDidDismiss().then(() => { + this.getRoomInfo(); + }); + } - await modal.present(); - - modal.onDidDismiss().then(() => { - this.getRoomInfo(); - }); } async editGroup(roomId) { 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 031820182..5ac3f36a4 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -528,7 +528,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe }); await modal.present(); modal.onDidDismiss().then(res => { - + console.log(res) if (res.data == 'leave') { this.getRoomInfo(); this.closeAllDesktopComponents.emit(); @@ -546,6 +546,9 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe //this.closeAllDesktopComponents.emit(); this.openEditGroupPage.emit(this.roomId); + } else if (res.data == 'addUser') { + + this.openGroupContactsPage(); } else { @@ -616,24 +619,26 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe } async addContacts() { + if(this.isAdmin) { + const modal = await this.modalController.create({ + component: GroupContactsPage, + componentProps: { + isCreated: this.isGroupCreated, + room: this.room, + members: this.members, + name: this.room.name, + }, + cssClass: 'contacts', + backdropDismiss: false + }); + + await modal.present(); + + modal.onDidDismiss().then(() => { + //this.getRoomInfo(); + }); + } - const modal = await this.modalController.create({ - component: GroupContactsPage, - componentProps: { - isCreated: this.isGroupCreated, - room: this.room, - members: this.members, - name: this.room.name, - }, - cssClass: 'contacts', - backdropDismiss: false - }); - - await modal.present(); - - modal.onDidDismiss().then(() => { - //this.getRoomInfo(); - }); } diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/shared/popover/chat-popover/chat-popover.page.html index 3ae9c4475..855a51407 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.html +++ b/src/app/shared/popover/chat-popover/chat-popover.page.html @@ -6,7 +6,7 @@