Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not show deactivated users in sharees and contacts #10543

Merged
merged 3 commits into from
Aug 10, 2018

Conversation

tcitworld
Copy link
Member

First part to fix #5608 : remove deactivated users from system address book.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
@tcitworld
Copy link
Member Author

The second part of fixes lacks tests into Test\Collaboration\Collaborators\UserPluginTest. I didn't manage to get that part in time, if someone wants to have a quick look.

@skjnldsv
Copy link
Member

skjnldsv commented Aug 6, 2018

@tcitworld ready for reviews?

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
@tcitworld
Copy link
Member Author

@skjnldsv Yes, it just lacks one more test.

Copy link
Member

@skjnldsv skjnldsv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code is ok 👍

@@ -106,6 +106,7 @@ public function testUpdateAndDeleteUser() {
$user->method('getUID')->willReturn('test-user');
$user->method('getCloudId')->willReturn('cloudId');
$user->method('getDisplayName')->willReturn('test-user');
$user->method('isEnabled')->willReturn(true);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would be great to have a test for the false condition as well 😉

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ChristophWurst How's that ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you just pushed what I was asking for 😉

I feel like this could probably be handled better :/

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
@tcitworld tcitworld added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Aug 6, 2018
@tcitworld tcitworld added this to the Nextcloud 14 milestone Aug 9, 2018
@rullzer rullzer mentioned this pull request Aug 9, 2018
45 tasks
@rullzer
Copy link
Member

rullzer commented Aug 9, 2018

@ChristophWurst so good to go from you?

Copy link
Member

@rullzer rullzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense 🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Deactivated Accounts still show up in Contacts for Chat and Videocalls
4 participants