Merge lp:~rbanffy/maas/1510210-cant-delete-user into lp:~maas-committers/maas/trunk
Proposed by
Ricardo Bánffy
Status: | Merged |
---|---|
Approved by: | Ricardo Bánffy |
Approved revision: | no longer in the source branch. |
Merged at revision: | 4424 |
Proposed branch: | lp:~rbanffy/maas/1510210-cant-delete-user |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
269 lines (+131/-6) 7 files modified
src/maasserver/api/tests/test_user.py (+92/-0) src/maasserver/api/users.py (+26/-1) src/maasserver/models/filestorage.py (+3/-1) src/maasserver/models/node.py (+3/-1) src/maasserver/models/sshkey.py (+2/-1) src/maasserver/models/sslkey.py (+2/-1) src/maasserver/models/staticipaddress.py (+3/-1) |
To merge this branch: | bzr merge lp:~rbanffy/maas/1510210-cant-delete-user |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Blake Rouse (community) | Approve | ||
Review via email: mp+275789@code.launchpad.net |
Commit message
Allows administrators to delete a user that has no attached nodes, IP address reservation or SSH/SSL keys. Prevent self-deletion.
To post a comment you must log in.
Looks generally good, but I think your to strict on the checking. We should not prevent the user from being deleted if they have ssh keys or ssl keys. Those are directly related to the user, we can just delete those when the user is deleted. Actually you can set those to CASCADE and they will be deleted for you, I believe.