Merge pull request #523 from AiursoftWeb/groupMgr

feat: allow owner to change the group name
AiursoftWeb · Jun 6, 2019 · 731ee54 · 731ee54
2 parents b949832 + 99daf30
commit 731ee54
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/app/Controllers/manageGroup.component.ts b/src/app/Controllers/manageGroup.component.ts
@@ -23,6 +23,7 @@ export class ManageGroupComponent implements OnInit {
 
     public conversation: GroupConversation;
     @ViewChild('imageInput', {static: false}) public imageInput;
+    public newGroupName: string;
 
     constructor(public groupsApiService: GroupsApiService,
                 public messageService: MessageService,
@@ -48,10 +49,12 @@ export class ManageGroupComponent implements OnInit {
                     this.messageService.conversation = conversation;
                     this.conversation = <GroupConversation>conversation;
                     this.conversation.avatarURL = Values.fileAddress + this.conversation.groupImageKey;
-
+                    this.newGroupName = this.conversation.groupName;
                 });
         } else {
             this.conversation = <GroupConversation>this.messageService.conversation;
+            this.conversation.avatarURL = Values.fileAddress + this.conversation.groupImageKey;
+            this.newGroupName = this.conversation.groupName;
         }
     }
 
@@ -129,7 +132,8 @@ export class ManageGroupComponent implements OnInit {
     }
 
     public saveInfo() {
-        this.groupsApiService.UpdateGroupInfo(this.conversation.groupName, this.conversation.groupImageKey).subscribe(res => {
+        this.groupsApiService.UpdateGroupInfo(this.conversation.groupName, this.conversation.groupImageKey, this.newGroupName)
+            .subscribe(res => {
             if (res.code === 0) {
                 Swal.fire('Success', res.message, 'success');
             } else {

diff --git a/src/app/Services/GroupsApiService.ts b/src/app/Services/GroupsApiService.ts
@@ -46,10 +46,11 @@ export class GroupsApiService {
         });
     }
 
-    public UpdateGroupInfo(groupName: string, avatarKey?: number): Observable<AiurProtocal> {
+    public UpdateGroupInfo(groupName: string, avatarKey?: number, newName?: string): Observable<AiurProtocal> {
         return this.apiService.Post(GroupsApiService.serverPath + '/UpdateGroupInfo', {
             GroupName: groupName,
             AvatarKey: avatarKey,
+            NewName: newName
         });
     }
 

diff --git a/src/app/Views/manageGroup.html b/src/app/Views/manageGroup.html
@@ -13,6 +13,10 @@
         <input type="file" name="image" id="image" #imageInput (change)="uploadAvatar()"
                accept="image/png, image/jpeg, image/bmp"/>
     </div>
+    <div class="profile">
+        <label>Group Name</label>
+        <input [(ngModel)]="newGroupName" placeholder="Enter the group name" type="text" (keyup.enter)="saveInfo()"/>
+    </div>
     <div class="buttons">
         <button id="save" class="button primary" (click)="saveInfo()" i18n="@@save">Save</button>
     </div>