From 2bc79cd94f6898efd53a9c59b15f72f49e732ebb Mon Sep 17 00:00:00 2001
From: Simon Backx <simon@ghost.org>
Date: Thu, 25 Aug 2022 17:01:12 +0200
Subject: [PATCH] Updated attribution counts linking to editor if zero

refs https://github.com/TryGhost/Team/issues/1843

- Also fixes that attribution counts are hidden for contributors
---
 .../app/components/gh-posts-list-item.hbs     | 34 +++++++++++++------
 ghost/admin/app/styles/layouts/content.css    |  2 +-
 ghost/admin/app/templates/posts.hbs           | 11 +++---
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/ghost/admin/app/components/gh-posts-list-item.hbs b/ghost/admin/app/components/gh-posts-list-item.hbs
index 154cb96751..1cb82b1a66 100644
--- a/ghost/admin/app/components/gh-posts-list-item.hbs
+++ b/ghost/admin/app/components/gh-posts-list-item.hbs
@@ -101,18 +101,32 @@
         {{/unless}}
     {{/if}}
 
-    {{#if this.feature.memberAttribution}}
-        <LinkTo @route="members" @query={{hash filterParam=(concat "signup:[" @post.id "]") }} class="permalink gh-list-data gh-post-list-signups">
-            <span class="midlightgrey {{if (not (eq @post.count.signups 0)) 'darkgrey'}} fw5 gh-content-attribution-stats">{{@post.count.signups}}</span>
-            <span class="midgrey-l2 fw4 gh-content-attribution-stats-mobile">{{gh-pluralize @post.count.signups "signup"}}</span>
-        </LinkTo>
+    {{#if (and this.feature.memberAttribution (not this.session.user.isContributor)) }}
+        {{#if @post.count.signups}}
+            <LinkTo @route="members" @query={{hash filterParam=(concat "signup:[" @post.id "]") }} class="permalink gh-list-data gh-post-list-signups active">
+                <span class="midlightgrey {{if (not (eq @post.count.signups 0)) 'darkgrey'}} fw5 gh-content-attribution-stats">{{@post.count.signups}}</span>
+                <span class="midgrey-l2 fw4 gh-content-attribution-stats-mobile">{{gh-pluralize @post.count.signups "signup"}}</span>
+            </LinkTo>
+        {{else}}
+            <LinkTo @route="editor.edit" @models={{array @post.displayName @post.id}} class="permalink gh-list-data gh-post-list-signups">
+                <span class="midlightgrey {{if (not (eq @post.count.signups 0)) 'darkgrey'}} fw5 gh-content-attribution-stats">{{@post.count.signups}}</span>
+                <span class="midgrey-l2 fw4 gh-content-attribution-stats-mobile">{{gh-pluralize @post.count.signups "signup"}}</span>
+            </LinkTo>
+        {{/if}}
     {{/if}}
 
-    {{#if this.feature.memberAttribution}}
-        <LinkTo @route="members" @query={{hash filterParam=(concat "conversion:[" @post.id "]") }} class="permalink gh-list-data gh-post-list-conversions">
-            <span class="midlightgrey {{if (not (eq @post.count.conversions 0)) 'darkgrey'}} fw5 gh-content-attribution-stats">{{@post.count.conversions}}</span>
-            <span class="midgrey-l2 fw4 gh-content-attribution-stats-mobile">{{gh-pluralize @post.count.conversions "conversion"}}</span>
-        </LinkTo>
+    {{#if (and this.feature.memberAttribution (not this.session.user.isContributor)) }}
+        {{#if @post.count.conversions}}
+            <LinkTo @route="members" @query={{hash filterParam=(concat "conversion:[" @post.id "]") }} class="permalink gh-list-data gh-post-list-conversions active">
+                <span class="midlightgrey {{if (not (eq @post.count.conversions 0)) 'darkgrey'}} fw5 gh-content-attribution-stats">{{@post.count.conversions}}</span>
+                <span class="midgrey-l2 fw4 gh-content-attribution-stats-mobile">{{gh-pluralize @post.count.conversions "conversion"}}</span>
+            </LinkTo>
+        {{else}}
+            <LinkTo @route="editor.edit" @models={{array @post.displayName @post.id}} class="permalink gh-list-data gh-post-list-conversions">
+                <span class="midlightgrey {{if (not (eq @post.count.conversions 0)) 'darkgrey'}} fw5 gh-content-attribution-stats">{{@post.count.conversions}}</span>
+                <span class="midgrey-l2 fw4 gh-content-attribution-stats-mobile">{{gh-pluralize @post.count.conversions "conversion"}}</span>
+            </LinkTo>
+        {{/if}}
     {{/if}}
 
     {{#if (and (not-eq this.settings.membersSignupAccess "none") (not-eq this.settings.editorDefaultEmailRecipients "disabled") (not this.session.user.isContributor))}}
diff --git a/ghost/admin/app/styles/layouts/content.css b/ghost/admin/app/styles/layouts/content.css
index cddb6a6760..39d182c96d 100644
--- a/ghost/admin/app/styles/layouts/content.css
+++ b/ghost/admin/app/styles/layouts/content.css
@@ -239,7 +239,7 @@
 }
 
 /** TODO: improve this hover style */
-a.gh-post-list-signups:hover > span, a.gh-post-list-conversions:hover > span {
+a.gh-post-list-signups.active:hover > span, a.gh-post-list-conversions.active:hover > span {
     opacity: 0.5;
 }
 
diff --git a/ghost/admin/app/templates/posts.hbs b/ghost/admin/app/templates/posts.hbs
index 25a21390c9..68d8412b8e 100644
--- a/ghost/admin/app/templates/posts.hbs
+++ b/ghost/admin/app/templates/posts.hbs
@@ -32,8 +32,9 @@
                 {{#if this.postsInfinityModel}}
                     <li class="gh-list-row header">
                         <div class="gh-list-header gh-posts-title-header">Title</div>
-                        {{#if this.feature.memberAttribution}}
-                            <div class="gh-list-header gh-posts-status-header"></div>
+                        
+                        {{#if (and this.feature.memberAttribution (not this.session.user.isContributor)) }}
+                        <div class="gh-list-header gh-posts-status-header"></div>
                             <div class="gh-list-header gh-posts-signups-header">Signups</div>
                             <div class="gh-list-header gh-posts-conversions-header">Paid</div>
                         {{/if}}
@@ -41,9 +42,9 @@
                             <div class="gh-list-header gh-posts-sends-header">Sends</div>
                             <div class="gh-list-header gh-posts-opens-header">Opens</div>
                         {{/if}}
-                        {{#unless this.feature.memberAttribution}}
+                        {{#if (or (not this.feature.memberAttribution) this.session.user.isContributor) }}
                             <div class="gh-list-header gh-posts-status-header">Status</div>
-                        {{/unless}}
+                        {{/if}}
                     </li>
                 {{/if}}
 
@@ -79,4 +80,4 @@
     </section>
 
     {{outlet}}
-</section>
\ No newline at end of file
+</section>