Merge lp:~libqtelegram-team/telegram-app/app-dev-remove-only-some-members into lp:telegram-app/app-dev

Proposed by Michał Karnicki
Status: Merged
Approved by: Roberto Mier Escandon
Approved revision: 205
Merged at revision: 205
Proposed branch: lp:~libqtelegram-team/telegram-app/app-dev-remove-only-some-members
Merge into: lp:telegram-app/app-dev
Diff against target: 44 lines (+4/-10)
1 file modified
ui/GroupProfilePage.qml (+4/-10)
To merge this branch: bzr merge lp:~libqtelegram-team/telegram-app/app-dev-remove-only-some-members
Reviewer Review Type Date Requested Status
libqtelegram team Pending
Review via email: mp+244589@code.launchpad.net

Description of the change

Test with plugin branch proposed here:
https://code.launchpad.net/~libqtelegram-team/libqtelegram/dev-remove-only-some-members/+merge/244590

Tested by as an admin user as well as an inviter user (not an admin). Admin can remove all, inviter can remove only those invited.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ui/GroupProfilePage.qml'
2--- ui/GroupProfilePage.qml 2014-12-12 11:07:08 +0000
3+++ ui/GroupProfilePage.qml 2014-12-12 14:13:46 +0000
4@@ -16,11 +16,6 @@
5
6 GroupModel {
7 id: groupModel
8-
9- onGroupDetailsRefreshed: {
10- console.log("yup onGroupDetailsRefreshed update");
11- membersModel.setup(chatId);
12- }
13 }
14
15 GroupMembersModel {
16@@ -37,8 +32,7 @@
17 }
18
19 function openChat(contact) {
20- pageStack.pop(); // ProfilePage
21- pageStack.pop(); // GroupChat
22+ pageStack.pop(); // this page
23 root.openChat(contact.name, contact.id,
24 membersModel.getInputPeerType(contact.peerType));
25 }
26@@ -184,7 +178,7 @@
27 Action {
28 iconName: "remove"
29 text: i18n.tr("Remove from group")
30- visible: isConnected /* && !model.isAdmin */ // Needs fixing.
31+ visible: isConnected && isRemovable
32 onTriggered: {
33 telegramClient.deleteChatUser(groupModel.chatId, model.id);
34 if (model.id === telegramClient.ourId &&
35@@ -207,7 +201,7 @@
36 }
37
38 Component.onCompleted: {
39- groupModel.setTelegramClient(telegramClient);
40- groupModel.setChatId(chatId);
41+ membersModel.setup(telegramClient, chatId);
42+ groupModel.setup(telegramClient, chatId);
43 }
44 }

Subscribers

People subscribed via source and target branches

to all changes: