diff --git a/app/assets/javascripts/discourse/app/controllers/user.js b/app/assets/javascripts/discourse/app/controllers/user.js index 2b39d06055..71990546c5 100644 --- a/app/assets/javascripts/discourse/app/controllers/user.js +++ b/app/assets/javascripts/discourse/app/controllers/user.js @@ -102,6 +102,11 @@ export default Controller.extend(CanCheckEmails, { return viewingSelf; }, + @discourseComputed("viewingSelf") + showRead(viewingSelf) { + return viewingSelf; + }, + @discourseComputed("viewingSelf", "currentUser.admin") showPrivateMessages(viewingSelf, isAdmin) { return ( diff --git a/app/assets/javascripts/discourse/app/routes/app-route-map.js b/app/assets/javascripts/discourse/app/routes/app-route-map.js index 8e66333e3e..67c6acc41f 100644 --- a/app/assets/javascripts/discourse/app/routes/app-route-map.js +++ b/app/assets/javascripts/discourse/app/routes/app-route-map.js @@ -125,6 +125,7 @@ export default function () { }); this.route("pending"); this.route("drafts"); + this.route("read"); } ); diff --git a/app/assets/javascripts/discourse/app/routes/user-activity-read.js b/app/assets/javascripts/discourse/app/routes/user-activity-read.js new file mode 100644 index 0000000000..1cfd2c9856 --- /dev/null +++ b/app/assets/javascripts/discourse/app/routes/user-activity-read.js @@ -0,0 +1,12 @@ +import UserAction from "discourse/models/user-action"; +import UserTopicListRoute from "discourse/routes/user-topic-list"; + +export default UserTopicListRoute.extend({ + userActionType: UserAction.TYPES.topics, + + model() { + return this.store.findFiltered("topicList", { + filter: "read", + }); + }, +}); diff --git a/app/assets/javascripts/discourse/app/templates/user/activity.hbs b/app/assets/javascripts/discourse/app/templates/user/activity.hbs index 6ccc09bd66..ebc73b137a 100644 --- a/app/assets/javascripts/discourse/app/templates/user/activity.hbs +++ b/app/assets/javascripts/discourse/app/templates/user/activity.hbs @@ -9,6 +9,11 @@