-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
Disabling users in WebUI #1234
Conversation
MorrisJobke
commented
Sep 1, 2016
- Disabling users in WebUI #413 rebased on master - by @Faldon
- I reviewed the layout and improved it a bit
- I will continue reviewing it and read through all comments in Disabling users in WebUI #413 and try to fix them
I tested this and it works quite well 👍 from me @rullzer @nickvergessen @LukasReschke @Mar1u5 @nextcloud/designers Please review |
@MorrisJobke Sorry, was out of town for a few days. I'm glad someone more drone experienced does the fixes. ;-) |
|
@@ -245,15 +241,18 @@ public function index($offset = 0, $limit = 10, $gid = '', $pattern = '', $backe | |||
|
|||
$users = []; | |||
if ($this->isAdmin) { | |||
|
|||
if($gid !== '') { | |||
if($gid !== '' && $gid !== 'disabledUsers') { |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Then name it NextcloudDisabledUsers
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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 😝
There was a problem hiding this comment.
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"
f929411
to
300d2d9
Compare
|
Why? |
@MorrisJobke because else firefox et all might desicde to do weird stuff again ;) |
But there is a viewbox ;) |
now there is ;) |
66a4ce6
to
6024cce
Compare
@rullzer Unit tests are added. This is ready for review - cc @LukasReschke @nickvergessen @rullzer |
@@ -245,15 +242,18 @@ public function index($offset = 0, $limit = 10, $gid = '', $pattern = '', $backe | |||
|
|||
$users = []; | |||
if ($this->isAdmin) { | |||
|
|||
if($gid !== '') { | |||
if($gid !== '' && $gid !== '_disabledUsers') { |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
LGTM then! |
@LukasReschke please review :) |
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>
d7fa187
to
c0e4fd0
Compare
Rebased to resolve conflicts in test file |
Tested and works 👍 |
Nearly 9 months after the rebase - sorry that it took so long, @Faldon |