Commit 36ece803 authored by mh's avatar mh
Browse files

also show over_quota in the user overview

parent 228762df
Pipeline #8674 passed with stage
in 2 minutes and 41 seconds
......@@ -426,6 +426,7 @@ class UserManager
locked_until: parse_locked_until(u.locked_until),
admin_locked: u.admin_locked,
locked: u.locked?,
over_quota: u.over_quota,
trust_changed: u.trust_changed,
mail_crypt_public_key: (if u.mail_crypt_public_key
Digest::SHA256.hexdigest(u.mail_crypt_public_key)
......
......@@ -37,7 +37,7 @@
:response:
:status: 200
:body:
- '{"result":"success","user":{"aliases":["fwd2@example.com","fwd3@example.com"],"fwd_to":[],"fwd_from":["fwd6@example.com"],"deleted_at":null,"email":"user2@example.com","domain":"example.com","login_method":"bcrypt","uid":"%UID%","lastlogin":"%LOGIN%","mbxquota":"1G","storagehost":"storage2.example.com","created_at":"%CREATED%","auth_failures":0,"locked_until":null,"admin_locked":"%UNLOCK_TOKEN%","locked":true,"trust_changed":null,"mail_crypt_public_key":"absent","mail_crypt_recovery_token":null,"recovery_email":false,"has_2fa":false,"ratelimit":null, "invite_token":null,"acl":"%SOME_ACL%"}}'
- '{"result":"success","user":{"aliases":["fwd2@example.com","fwd3@example.com"],"fwd_to":[],"fwd_from":["fwd6@example.com"],"deleted_at":null,"email":"user2@example.com","domain":"example.com","login_method":"bcrypt","uid":"%UID%","lastlogin":"%LOGIN%","mbxquota":"1G","storagehost":"storage2.example.com","created_at":"%CREATED%","auth_failures":0,"locked_until":null,"admin_locked":"%UNLOCK_TOKEN%","locked":true,"over_quota":false,"trust_changed":null,"mail_crypt_public_key":"absent","mail_crypt_recovery_token":null,"recovery_email":false,"has_2fa":false,"ratelimit":null, "invite_token":null,"acl":"%SOME_ACL%"}}'
---
:request:
:method: :get
......
......@@ -133,7 +133,7 @@
:response:
:status: 200
:body:
- '{"result":"success","user":{"aliases":[],"fwd_to":[],"fwd_from":[],"deleted_at":null,"email":"change-pw-test@private.example.com","domain":"private.example.com","login_method":"mail_crypt","uid":"%UID%","lastlogin":"%LOGIN%","mbxquota":"1G","storagehost":"storage1.example.com","created_at":"%CREATEDAD%","auth_failures":0,"locked_until":null,"admin_locked":null,"locked":false,"trust_changed":null,"mail_crypt_public_key":"%PUBKEY%","mail_crypt_recovery_token":"absent","recovery_email":true,"has_2fa":false,"ratelimit":null,"invite_token":null,"acl":"%SOME_ACL%"}}'
- '{"result":"success","user":{"aliases":[],"fwd_to":[],"fwd_from":[],"deleted_at":null,"email":"change-pw-test@private.example.com","domain":"private.example.com","login_method":"mail_crypt","uid":"%UID%","lastlogin":"%LOGIN%","mbxquota":"1G","storagehost":"storage1.example.com","created_at":"%CREATEDAD%","auth_failures":0,"locked_until":null,"admin_locked":null,"locked":false,"over_quota":false,"trust_changed":null,"mail_crypt_public_key":"%PUBKEY%","mail_crypt_recovery_token":"absent","recovery_email":true,"has_2fa":false,"ratelimit":null,"invite_token":null,"acl":"%SOME_ACL%"}}'
---
:request:
:method: :post
......
......@@ -68,7 +68,7 @@
:response:
:status: 200
:body:
- '{"result":"success","user":{"aliases":[],"fwd_to":[],"fwd_from":[],"deleted_at":null,"email":"recovery_test@example.com","domain":"example.com","login_method":"mail_crypt","uid":"%UID%","lastlogin":"%LASTLOGIN%","mbxquota":"1G","storagehost":"storage1.example.com","created_at":"%CREATEDAT%","auth_failures":0,"locked_until":null,"admin_locked":null,"locked":false,"trust_changed":null,"mail_crypt_public_key":"%PUBKEY%","mail_crypt_recovery_token":"absent","recovery_email":false,"has_2fa":false,"ratelimit":null,"invite_token":null,"acl":"%SOME_ACL%"}}'
- '{"result":"success","user":{"aliases":[],"fwd_to":[],"fwd_from":[],"deleted_at":null,"email":"recovery_test@example.com","domain":"example.com","login_method":"mail_crypt","uid":"%UID%","lastlogin":"%LASTLOGIN%","mbxquota":"1G","storagehost":"storage1.example.com","created_at":"%CREATEDAT%","auth_failures":0,"locked_until":null,"admin_locked":null,"locked":false,"over_quota":false,"trust_changed":null,"mail_crypt_public_key":"%PUBKEY%","mail_crypt_recovery_token":"absent","recovery_email":false,"has_2fa":false,"ratelimit":null,"invite_token":null,"acl":"%SOME_ACL%"}}'
---
:request:
:method: :post
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment