FIX: ensures secondary menu of user notifications mobile nav reloads (#…

…8716)
discourse · Jan 15, 2020 · ec1aeb8 · ec1aeb8
1 parent b1508a6
commit ec1aeb8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/assets/javascripts/discourse/controllers/user-notifications.js.es6 b/app/assets/javascripts/discourse/controllers/user-notifications.js.es6
@@ -5,9 +5,13 @@ import {
   default as discourseComputed,
   observes
 } from "discourse-common/utils/decorators";
+import { readOnly } from "@ember/object/computed";
+import { inject as service } from "@ember/service";
 
 export default Controller.extend({
   application: inject(),
+  router: service(),
+  currentPath: readOnly("router._router.currentPath"),
 
   @observes("model.canLoadMore")
   _showFooter() {

diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/templates/user/notifications.hbs
@@ -1,5 +1,5 @@
 {{#d-section pageClass="user-notifications" class="user-secondary-navigation"}}
-  {{#mobile-nav class='notifications-nav' desktopClass='notification-list action-list nav-stacked' currentPath=router._router.currentPath}}
+  {{#mobile-nav class='notifications-nav' desktopClass='notification-list action-list nav-stacked' currentPath=currentPath}}
     <li>
       {{#link-to 'userNotifications.index'}}
         {{i18n 'user.filters.all'}}