mirror of https://github.com/h44z/wg-portal.git
				
				
				
			frontend: fix locked user display (#367)
This commit is contained in:
		
							parent
							
								
									fc712ebf42
								
							
						
					
					
						commit
						f6d7a851d1
					
				|  | @ -51,6 +51,7 @@ watch(() => props.visible, async (newValue, oldValue) => { | ||||||
|           formData.value.Notes = selectedUser.value.Notes |           formData.value.Notes = selectedUser.value.Notes | ||||||
|           formData.value.Password = "" |           formData.value.Password = "" | ||||||
|           formData.value.Disabled = selectedUser.value.Disabled |           formData.value.Disabled = selectedUser.value.Disabled | ||||||
|  |           formData.value.Locked = selectedUser.value.Locked | ||||||
|         } |         } | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  | @ -97,10 +97,16 @@ func NewDomainUser(src *User) *domain.User { | ||||||
| 
 | 
 | ||||||
| 	if src.Disabled { | 	if src.Disabled { | ||||||
| 		res.Disabled = &now | 		res.Disabled = &now | ||||||
|  | 		if src.DisabledReason == "" { | ||||||
|  | 			res.DisabledReason = domain.DisabledReasonAdmin | ||||||
|  | 		} | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	if src.Locked { | 	if src.Locked { | ||||||
| 		res.Locked = &now | 		res.Locked = &now | ||||||
|  | 		if src.LockedReason == "" { | ||||||
|  | 			res.LockedReason = domain.LockedReasonAdmin | ||||||
|  | 		} | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	return res | 	return res | ||||||
|  |  | ||||||
|  | @ -115,10 +115,16 @@ func NewDomainUser(src *User) *domain.User { | ||||||
| 
 | 
 | ||||||
| 	if src.Disabled { | 	if src.Disabled { | ||||||
| 		res.Disabled = &now | 		res.Disabled = &now | ||||||
|  | 		if src.DisabledReason == "" { | ||||||
|  | 			res.DisabledReason = domain.DisabledReasonApi | ||||||
|  | 		} | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	if src.Locked { | 	if src.Locked { | ||||||
| 		res.Locked = &now | 		res.Locked = &now | ||||||
|  | 		if src.LockedReason == "" { | ||||||
|  | 			res.LockedReason = domain.LockedReasonApi | ||||||
|  | 		} | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	return res | 	return res | ||||||
|  |  | ||||||
|  | @ -51,14 +51,13 @@ const ( | ||||||
| 	DisabledReasonDeleted          = "deleted" | 	DisabledReasonDeleted          = "deleted" | ||||||
| 	DisabledReasonUserDisabled     = "user disabled" | 	DisabledReasonUserDisabled     = "user disabled" | ||||||
| 	DisabledReasonUserDeleted      = "user deleted" | 	DisabledReasonUserDeleted      = "user deleted" | ||||||
| 	DisabledReasonUserEdit         = "user edit action" | 	DisabledReasonAdmin            = "disabled by admin" | ||||||
| 	DisabledReasonUserCreate       = "user create action" | 	DisabledReasonApi              = "disabled through api" | ||||||
| 	DisabledReasonAdminEdit        = "admin edit action" |  | ||||||
| 	DisabledReasonAdminCreate      = "admin create action" |  | ||||||
| 	DisabledReasonApiEdit          = "api edit action" |  | ||||||
| 	DisabledReasonApiCreate        = "api create action" |  | ||||||
| 	DisabledReasonLdapMissing      = "missing in ldap" | 	DisabledReasonLdapMissing      = "missing in ldap" | ||||||
| 	DisabledReasonUserMissing      = "missing user" | 	DisabledReasonUserMissing      = "missing user" | ||||||
| 	DisabledReasonMigrationDummy   = "migration dummy user" | 	DisabledReasonMigrationDummy   = "migration dummy user" | ||||||
| 	DisabledReasonInterfaceMissing = "missing WireGuard interface" | 	DisabledReasonInterfaceMissing = "missing WireGuard interface" | ||||||
|  | 
 | ||||||
|  | 	LockedReasonAdmin = "locked by admin" | ||||||
|  | 	LockedReasonApi   = "locked by admin" | ||||||
| ) | ) | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue