mirror/galene
1
Fork 0
mirror of https://github.com/jech/galene.git synced 2024-11-12 19:55:59 +01:00
Code Activity

Add String method to group.Permissions.

Browse source
This commit is contained in:
Juliusz Chroboczek 2024-10-30 14:10:28 +01:00
parent f0b26c63c9
commit cd224ffed2
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
group/description.go
View file

@ -83,6 +83,20 @@ func (p Permissions) Permissions(desc *Description) []string {
return perms return perms
} }
func (p Permissions) String() string {
if p.name != "" {
if p.permissions != nil {
return fmt.Sprintf("(ERROR=overconstrained %v)", p.name)
}
return p.name
}
v, err := json.Marshal(p)
if err == nil {
return fmt.Sprintf("(ERROR=%v)", err)
}
return string(v)
}
func (p *Permissions) UnmarshalJSON(b []byte) error { func (p *Permissions) UnmarshalJSON(b []byte) error {
var a []string var a []string
err := json.Unmarshal(b, &a) err := json.Unmarshal(b, &a)
@ -119,7 +133,7 @@ type UserDescription struct {
Permissions Permissions `json:"permissions"` Permissions Permissions `json:"permissions"`
} }
// Custom MarshalJSON in order to omit ompty fields // Custom MarshalJSON in order to omit empty fields
func (u UserDescription) MarshalJSON() ([]byte, error) { func (u UserDescription) MarshalJSON() ([]byte, error) {
uu := make(map[string]any, 2) uu := make(map[string]any, 2)
if u.Password.Type != "" { if u.Password.Type != "" {