FIX: ensure URLs include subfolder in admin emails UI

This commit is contained in:
Neil Lalonde 2018-08-08 16:47:54 -04:00
parent b53d3457c8
commit f7b4a2b3ba
2 changed files with 30 additions and 0 deletions

View File

@ -11,6 +11,10 @@ EmailLog.reopenClass({
attrs.user = AdminUser.create(attrs.user);
}
if (attrs.post_url) {
attrs.post_url = Discourse.getURL(attrs.post_url);
}
return this._super(attrs);
},

View File

@ -5,3 +5,29 @@ QUnit.module("Discourse.EmailLog");
QUnit.test("create", assert => {
assert.ok(EmailLog.create(), "it can be created without arguments");
});
QUnit.test("subfolder support", assert => {
Discourse.BaseUri = "/forum";
const attrs = {
id: 60,
to_address: "wikiman@asdf.com",
email_type: "user_linked",
user_id: 9,
created_at: "2018-08-08T17:21:52.022Z",
post_url: "/t/some-pro-tips-for-you/41/5",
post_description: "Some Pro Tips For You",
bounced: false,
user: {
id: 9,
username: "wikiman",
avatar_template:
"/forum/letter_avatar_proxy/v2/letter/w/dfb087/{size}.png"
}
};
const emailLog = EmailLog.create(attrs);
assert.equal(
emailLog.get("post_url"),
"/forum/t/some-pro-tips-for-you/41/5",
"includes the subfolder in the post url"
);
});