Feature/v2.9.2 (#344)
* feature/v2.9.0 ui优化 * add test case add test case * feature/v2.9.2 bug fix --------- Co-authored-by: Your Name <you@example.com>
This commit is contained in:
1 parent
68dc2f0f47
commit
6455635f74
11 files changed
+257
-66
No files matched your search
@@ -77,6 +77,11 @@ func EmailList(ctx *context.Context, w http.ResponseWriter, req *http.Request) {
|
||||
var sender User
|
||||
_ = json.Unmarshal([]byte(email.Sender), &sender)
|
||||
|
||||
if sender.EmailAddress == "" {
|
||||
sender.EmailAddress = email.FromAddress
|
||||
sender.Name = email.FromName
|
||||
}
|
||||
|
||||
var tos []User
|
||||
_ = json.Unmarshal([]byte(email.To), &tos)
|
||||
|
||||
|
||||
+18
-23
@@ -30,29 +30,24 @@ func GetUserGroup(ctx *context.Context, w http.ResponseWriter, req *http.Request
|
||||
|
||||
retData := []*group.GroupItem{
|
||||
{
|
||||
Label: i18n.GetText(ctx.Lang, "all_email"),
|
||||
Children: []*group.GroupItem{
|
||||
{
|
||||
Label: i18n.GetText(ctx.Lang, "inbox"),
|
||||
Tag: dto.SearchTag{Type: 0, Status: -1, GroupId: 0}.ToString(),
|
||||
},
|
||||
{
|
||||
Label: i18n.GetText(ctx.Lang, "outbox"),
|
||||
Tag: dto.SearchTag{Type: 1, Status: -1}.ToString(),
|
||||
},
|
||||
{
|
||||
Label: i18n.GetText(ctx.Lang, "sketch"),
|
||||
Tag: dto.SearchTag{Type: 0, Status: 4}.ToString(),
|
||||
},
|
||||
{
|
||||
Label: i18n.GetText(ctx.Lang, "junk"),
|
||||
Tag: dto.SearchTag{Type: -1, Status: 5}.ToString(),
|
||||
},
|
||||
{
|
||||
Label: i18n.GetText(ctx.Lang, "deleted"),
|
||||
Tag: dto.SearchTag{Type: -1, Status: 3}.ToString(),
|
||||
},
|
||||
},
|
||||
Label: i18n.GetText(ctx.Lang, "inbox"),
|
||||
Tag: dto.SearchTag{Type: 0, Status: -1, GroupId: 0}.ToString(),
|
||||
},
|
||||
{
|
||||
Label: i18n.GetText(ctx.Lang, "outbox"),
|
||||
Tag: dto.SearchTag{Type: 1, Status: -1}.ToString(),
|
||||
},
|
||||
{
|
||||
Label: i18n.GetText(ctx.Lang, "sketch"),
|
||||
Tag: dto.SearchTag{Type: 0, Status: 4}.ToString(),
|
||||
},
|
||||
{
|
||||
Label: i18n.GetText(ctx.Lang, "junk"),
|
||||
Tag: dto.SearchTag{Type: -1, Status: 5}.ToString(),
|
||||
},
|
||||
{
|
||||
Label: i18n.GetText(ctx.Lang, "deleted"),
|
||||
Tag: dto.SearchTag{Type: -1, Status: 3}.ToString(),
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user