mirror of
https://github.com/discourse/discourse.git
synced 2025-06-06 22:06:46 +08:00
FIX: correctly shows suggested topics label (#9017)
This commit is contained in:
@ -10,7 +10,8 @@ export default Component.extend({
|
|||||||
classNames: ["suggested-topics"],
|
classNames: ["suggested-topics"],
|
||||||
|
|
||||||
suggestedTitleLabel: computed("topic", function() {
|
suggestedTitleLabel: computed("topic", function() {
|
||||||
if (this.currentUser && this.currentUser.pmPath(this.topic)) {
|
const href = this.currentUser && this.currentUser.pmPath(this.topic);
|
||||||
|
if (this.topic.get("isPrivateMessage") && href) {
|
||||||
return "suggested_topics.pm_title";
|
return "suggested_topics.pm_title";
|
||||||
} else {
|
} else {
|
||||||
return "suggested_topics.title";
|
return "suggested_topics.title";
|
||||||
|
@ -13,6 +13,17 @@ QUnit.test("footer edit button", async assert => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
QUnit.test("suggested messages", async assert => {
|
||||||
|
await visit("/t/pm-for-testing/12");
|
||||||
|
|
||||||
|
assert.equal(
|
||||||
|
find("#suggested-topics .suggested-topics-title")
|
||||||
|
.text()
|
||||||
|
.trim(),
|
||||||
|
I18n.t("suggested_topics.pm_title")
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
acceptance("Personal Message Tagging", {
|
acceptance("Personal Message Tagging", {
|
||||||
loggedIn: true,
|
loggedIn: true,
|
||||||
site: { can_tag_pms: true }
|
site: { can_tag_pms: true }
|
||||||
|
@ -207,6 +207,17 @@ QUnit.test(
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
QUnit.test("Suggested topics", async assert => {
|
||||||
|
await visit("/t/internationalization-localization/280");
|
||||||
|
|
||||||
|
assert.equal(
|
||||||
|
find("#suggested-topics .suggested-topics-title")
|
||||||
|
.text()
|
||||||
|
.trim(),
|
||||||
|
I18n.t("suggested_topics.title")
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
QUnit.skip("Deleting a topic", async assert => {
|
QUnit.skip("Deleting a topic", async assert => {
|
||||||
await visit("/t/internationalization-localization/280");
|
await visit("/t/internationalization-localization/280");
|
||||||
await click(".topic-post:eq(0) button.show-more-actions");
|
await click(".topic-post:eq(0) button.show-more-actions");
|
||||||
|
@ -3852,6 +3852,49 @@ export default {
|
|||||||
destination_category_id: 3
|
destination_category_id: 3
|
||||||
},
|
},
|
||||||
"/t/12/1.json": {
|
"/t/12/1.json": {
|
||||||
|
suggested_topics: [
|
||||||
|
{
|
||||||
|
id: 8,
|
||||||
|
title: "This is a new and awesome topic!",
|
||||||
|
fancy_title: "This is a new and awesome topic!",
|
||||||
|
slug: "this-is-a-new-and-awesome-topic",
|
||||||
|
posts_count: 3,
|
||||||
|
reply_count: 0,
|
||||||
|
highest_post_number: 5,
|
||||||
|
image_url: null,
|
||||||
|
created_at: "2015-08-13T05:17:00.000Z",
|
||||||
|
last_posted_at: "2015-08-13T10:14:34.799Z",
|
||||||
|
bumped: true,
|
||||||
|
bumped_at: "2015-08-13T10:14:34.799Z",
|
||||||
|
unseen: false,
|
||||||
|
last_read_post_number: 5,
|
||||||
|
unread: 0,
|
||||||
|
new_posts: 0,
|
||||||
|
pinned: false,
|
||||||
|
unpinned: null,
|
||||||
|
visible: true,
|
||||||
|
closed: false,
|
||||||
|
archived: false,
|
||||||
|
notification_level: 2,
|
||||||
|
bookmarked: false,
|
||||||
|
liked: false,
|
||||||
|
archetype: "regular",
|
||||||
|
like_count: 0,
|
||||||
|
views: 2,
|
||||||
|
category_id: 1,
|
||||||
|
posters: [
|
||||||
|
{
|
||||||
|
extras: "latest single",
|
||||||
|
description: "Original Poster, Most Recent Poster",
|
||||||
|
user: {
|
||||||
|
id: 1,
|
||||||
|
username: "test",
|
||||||
|
avatar_template: "/images/avatar.png"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
post_stream: {
|
post_stream: {
|
||||||
posts: [
|
posts: [
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user