Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-15 14:56:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge master into devel

Browse Source
This commit is contained in:
Jakub
2020-10-23 10:29:17 +02:00
parent 7e0a9f398c 2d8a676dd5
commit 8985738af5
27 changed files with 272 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/fakeapi/controller_control.go
View File

@ -83,6 +83,9 @@ func (ctl *Controller) AddUserLabel(username string, label *pmapi.Label) error {
}
label.ID = ctl.labelIDGenerator.next(prefix)
label.Name = labelName
if label.Path == "" {
label.Path = label.Name
}
ctl.labelsByUsername[username] = append(ctl.labelsByUsername[username], label)
ctl.resetUsers()
return nil