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

Disabling users in WebUI #1234

Merged
merged 18 commits into from
Apr 29, 2017
Merged

Disabling users in WebUI #1234

merged 18 commits into from
Apr 29, 2017

Conversation

MorrisJobke
Copy link
Member

@MorrisJobke MorrisJobke added the 2. developing Work in progress label Sep 1, 2016
@MorrisJobke MorrisJobke self-assigned this Sep 1, 2016
@MorrisJobke
Copy link
Member Author

MorrisJobke commented Sep 1, 2016

It now looks like this:

bildschirmfoto 2016-09-01 um 16 53 20

Before it looked like this:

bildschirmfoto 2016-09-01 um 16 59 34

@MorrisJobke
Copy link
Member Author

I tested this and it works quite well 👍 from me

@rullzer @nickvergessen @LukasReschke @Mar1u5 @nextcloud/designers Please review

@MorrisJobke MorrisJobke added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Sep 1, 2016
@MorrisJobke MorrisJobke removed their assignment Sep 1, 2016
@MorrisJobke MorrisJobke added this to the Nextcloud 11.0 milestone Sep 1, 2016
@MorrisJobke MorrisJobke added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Sep 1, 2016
@MorrisJobke MorrisJobke self-assigned this Sep 1, 2016
@Faldon
Copy link
Contributor

Faldon commented Sep 4, 2016

@MorrisJobke Sorry, was out of town for a few days. I'm glad someone more drone experienced does the fixes. ;-)

@rullzer
Copy link
Member

rullzer commented Sep 9, 2016

  • SVGs need to be minimized
  • SVGs need proper viewBox

@@ -245,15 +241,18 @@ public function index($offset = 0, $limit = 10, $gid = '', $pattern = '', $backe

$users = [];
if ($this->isAdmin) {

if($gid !== '') {
if($gid !== '' && $gid !== 'disabledUsers') {
Copy link
Member

Choose a reason for hiding this comment

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

This will explode if anybody ever creates a group disabledUsers

Copy link
Member Author

Choose a reason for hiding this comment

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

Then name it NextcloudDisabledUsers

Copy link
Member

Choose a reason for hiding this comment

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

Why not just another parameter $disabledUsers that defaults to false?

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah yes ... makes sense then 🙈 It's early in the morning 😝

Copy link
Member

Choose a reason for hiding this comment

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

Well we have the same problem with the group "everyone"

@rullzer
Copy link
Member

rullzer commented Sep 9, 2016

  • Rebased
  • Fixed the current unit tests
  • Add unit tests for disabled users

@MorrisJobke
Copy link
Member Author

SVGs need proper viewBox

Why?

@rullzer
Copy link
Member

rullzer commented Sep 10, 2016

@MorrisJobke because else firefox et all might desicde to do weird stuff again ;)

@MorrisJobke
Copy link
Member Author

@MorrisJobke because else firefox et all might desicde to do weird stuff again ;)

But there is a viewbox ;)

@rullzer
Copy link
Member

rullzer commented Sep 12, 2016

now there is ;)

@MorrisJobke MorrisJobke added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Sep 14, 2016
@MorrisJobke
Copy link
Member Author

@rullzer Unit tests are added.

This is ready for review - cc @LukasReschke @nickvergessen @rullzer

@MorrisJobke MorrisJobke removed their assignment Sep 14, 2016
@@ -245,15 +242,18 @@ public function index($offset = 0, $limit = 10, $gid = '', $pattern = '', $backe

$users = [];
if ($this->isAdmin) {

if($gid !== '') {
if($gid !== '' && $gid !== '_disabledUsers') {
Copy link
Member

Choose a reason for hiding this comment

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

Should we add a public constant for this?

Copy link
Member Author

Choose a reason for hiding this comment

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

I would say that this is something for a different PR, because then the "_everyone" group should also be handled.

@rullzer
Copy link
Member

rullzer commented Sep 14, 2016

LGTM then!

@MorrisJobke
Copy link
Member Author

@LukasReschke please review :)

Thomas Pulzer and others added 18 commits April 29, 2017 00:54
Implemented visuals for enabling/disabling user from admin user list.
Added the controller functions for enabling/disabling a user.

Added the route for changing user status (enabled/disabled) and added an additional route handler in the user controller.
 Finished the visuals to reflect current user status and changed user status respectively.

Changed the single icon for enabling/disabling a user into a menu where deletion and state toggling of a user is selectable.

Added displaying of disabled user count.
Improved style of user action menu.

Added proper counting of disabled users.
Removed visual indicator for disabled users.

Moved pseudo-group detection for disabled users from frontend to the controller.
Changed units for newly introduced css values from em to px.
Removed unnecessary png and optimized svg with scour.
Changed the userlist template to display the user action menu with correct width.

Style fixes for better readability and coding style conformity.

Changed the icons for enabling, disabling and deleting a user in the action menu.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Users page takes advantage of that

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
and fix a unit test

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@MorrisJobke
Copy link
Member Author

Rebased to resolve conflicts in test file

@MorrisJobke
Copy link
Member Author

Tested and works 👍

@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Apr 29, 2017
@MorrisJobke MorrisJobke merged commit 854dfef into master Apr 29, 2017
@MorrisJobke MorrisJobke deleted the rebase-413-by-faldon branch April 29, 2017 04:35
@MorrisJobke
Copy link
Member Author

Nearly 9 months after the rebase - sorry that it took so long, @Faldon

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish enhancement feature: users and groups
Projects
None yet
Development

Successfully merging this pull request may close these issues.