Skip to content

Commit 62ba3e9

Browse files
Merge pull request #240 from conjoon/lumen-app-email#58
Php ms imapuser#58
2 parents 7faa170 + 676c713 commit 62ba3e9

File tree

3 files changed

+18
-11
lines changed

3 files changed

+18
-11
lines changed

src/view/mail/message/editor/MessageEditorViewController.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -601,9 +601,19 @@ Ext.define("conjoon.cn_mail.view.mail.message.editor.MessageEditorViewController
601601
throw("\"baseAddress\" must be a string");
602602
}
603603

604+
let url = [
605+
baseAddress,
606+
"MailAccounts",
607+
encodeURIComponent(messageDraft.getCompoundKey().getMailAccountId()),
608+
"MailFolders",
609+
encodeURIComponent(messageDraft.getCompoundKey().getMailFolderId()),
610+
"MessageItems",
611+
encodeURIComponent(messageDraft.getCompoundKey().getId())
612+
].join("/");
613+
604614
return {
605-
url: l8.unify(baseAddress + "/SendMessage", "/", "://"),
606-
params: messageDraft.getCompoundKey().toObject()
615+
url: l8.unify(url, "/", "://"),
616+
method: "POST"
607617
};
608618

609619
},

tests/lib/mail/TestHelper.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ export default class TestHelper {
112112
"conjoon.dev.cn_mailsim.data.AttachmentSim",
113113
"conjoon.dev.cn_mailsim.data.MailAccountSim",
114114
"conjoon.dev.cn_mailsim.data.MailFolderSim",
115-
"conjoon.dev.cn_mailsim.data.MessageItemSim",
116-
"conjoon.dev.cn_mailsim.data.SendMessageSim", () => {
115+
"conjoon.dev.cn_mailsim.data.MessageItemSim", () => {
117116

118117
conjoon.dev.cn_mailsim.data.table.MessageTable.ITEM_LENGTH = 100;
119118

@@ -125,9 +124,7 @@ export default class TestHelper {
125124
"conjoon.dev.cn_mailsim.data.MailFolderSim": Object.assign(
126125
config.mailFolder, {url: "cn_mail/MailAccounts/(.+)/MailFolders(/.*)?"}),
127126
"conjoon.dev.cn_mailsim.data.MailAccountSim": Object.assign(
128-
config.mailAccount, {url: "cn_mail/MailAccounts(/d+)?"}),
129-
"conjoon.dev.cn_mailsim.data.SendMessageSim": Object.assign(
130-
config.sendMessage, {url: "cn_mail/SendMessage(/d+)?"})
127+
config.mailAccount, {url: "cn_mail/MailAccounts(/d+)?"})
131128
}).forEach(([cls, config]) => {
132129

133130
Ext.ux.ajax.SimManager.register(

tests/src/view/mail/message/editor/MessageEditorViewControllerTest_03.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* conjoon
33
* extjs-app-webmail
4-
* Copyright (C) 2020-2021 Thorsten Suckow-Homberg https://github.com/conjoon/extjs-app-webmail
4+
* Copyright (C) 2020-2022 Thorsten Suckow-Homberg https://github.com/conjoon/extjs-app-webmail
55
*
66
* Permission is hereby granted, free of charge, to any person
77
* obtaining a copy of this software and associated documentation
@@ -65,7 +65,7 @@ StartTest(async t => {
6565
});
6666

6767
let messageDraft = Ext.create("conjoon.cn_mail.model.mail.message.MessageDraft", {
68-
mailAccountId: 1, mailFolderId: 1, id: 1
68+
mailAccountId: 1, mailFolderId: 3, id: 2
6969
});
7070
messageDraft.dirty = messageDraft.phantom = false;
7171

@@ -80,8 +80,8 @@ StartTest(async t => {
8080
t.expect(
8181
controller.getSendMessageDraftRequestConfig(messageDraft, ".//cn_mail///")
8282
).toEqual({
83-
url: "./cn_mail/SendMessage",
84-
params: messageDraft.getCompoundKey().toObject()
83+
url: "./cn_mail/MailAccounts/1/MailFolders/3/MessageItems/2",
84+
method: "POST"
8585
});
8686

8787
let tmp = Ext.Ajax.request;

0 commit comments

Comments
 (0)