From a8a7e981505376acec186f252cf57c8f42fddf7c Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Fri, 10 Feb 2017 13:24:13 +0000
Subject: [PATCH] Content link resets filter if already viewing content screen
 (#521)

no issue

- the content filter will be remembered if you navigate away from then back to the content screen
- this PR changes the behaviour slightly so that clicking the sidebar "Content" link whilst viewing the content screen will act as a shortcut to reset the filter
---
 ghost/admin/app/components/gh-nav-menu.js            | 1 +
 ghost/admin/app/templates/components/gh-nav-menu.hbs | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ghost/admin/app/components/gh-nav-menu.js b/ghost/admin/app/components/gh-nav-menu.js
index 37ae0a082f..2dd160a1a0 100644
--- a/ghost/admin/app/components/gh-nav-menu.js
+++ b/ghost/admin/app/components/gh-nav-menu.js
@@ -20,6 +20,7 @@ export default Component.extend({
     session: injectService(),
     ghostPaths: injectService(),
     feature: injectService(),
+    routing: injectService('-routing'),
 
     mouseEnter() {
         this.sendAction('onMouseEnter');
diff --git a/ghost/admin/app/templates/components/gh-nav-menu.hbs b/ghost/admin/app/templates/components/gh-nav-menu.hbs
index a789ef8bd1..0f200340c8 100644
--- a/ghost/admin/app/templates/components/gh-nav-menu.hbs
+++ b/ghost/admin/app/templates/components/gh-nav-menu.hbs
@@ -21,8 +21,15 @@
     <ul class="gh-nav-list gh-nav-main">
         {{!<li><i class="icon-dash"></i>Dashboard</li>}}
         <li>{{#link-to "editor.new" classNames="gh-nav-main-editor"}}<i class="icon-pen"></i>New Post{{/link-to}}</li>
-        <li>{{#link-to "posts" classNames="gh-nav-main-content"}}<i class="icon-content"></i>Content{{/link-to}}</li>
         {{!<li><a href="#"><i class="icon-user"></i>My Posts</a></li>}}
+        <li>
+            {{!-- clicking the Content link whilst on the content screen should reset the filter --}}
+            {{#if (eq routing.currentRouteName "posts.index")}}
+                {{#link-to "posts" (query-params type=null) classNames="gh-nav-main-content active"}}<i class="icon-content"></i>Content{{/link-to}}
+            {{else}}
+                {{#link-to "posts" classNames="gh-nav-main-content"}}<i class="icon-content"></i>Content{{/link-to}}
+            {{/if}}
+        </li>
         <li>{{#link-to "team" classNames="gh-nav-main-users"}}<i class="icon-team"></i>Team{{/link-to}}</li>
         {{!<li><a href="#"><i class="icon-idea"></i>Ideas</a></li>}}
         {{#if feature.subscribers}}