From: dklawren <dklawren@users.noreply.github.com>
Date: Tue, 19 Mar 2019 22:07:15 +0000 (-0400)
Subject: Bug 1534084 - Hide Phablicator requests from Attachment list
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89fbd49cbee4b3b564b000ce193fd2111938962c;p=thirdparty%2Fbugzilla.git

Bug 1534084 - Hide Phablicator requests from Attachment list
---

diff --git a/extensions/BugModal/template/en/default/bug_modal/attachments.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/attachments.html.tmpl
index 1e5da5b95..b9291ef3d 100644
--- a/extensions/BugModal/template/en/default/bug_modal/attachments.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/attachments.html.tmpl
@@ -24,6 +24,7 @@
         [%~ " bz_private" IF attachment.isprivate %]
         [%~ " attach-obsolete" IF attachment.isobsolete %]
         [%~ " attach-patch" IF attachment.can_review %]
+        [%~ " bz_default_hidden" IF phabricator_revisions.size && attachment.contenttype == phabricator_content_type %]
     " [% IF attachment.isobsolete %]style="display:none"[% END %]>
       <td class="attach-desc-td">
         <div class="attach-desc">
diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
index 281a438b8..d3d539426 100644
--- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
@@ -49,6 +49,7 @@
   obsolete_attachments = 0;
   FOREACH attachment IN bug.attachments;
     NEXT IF attachment.isprivate && !(user.is_insider || attachment.attacher.id == user.id);
+    NEXT IF phabricator_revisions.size && attachment.contenttype == phabricator_content_type;
     IF attachment.isobsolete;
       obsolete_attachments = obsolete_attachments + 1;
     ELSE;
diff --git a/extensions/PhabBugz/Extension.pm b/extensions/PhabBugz/Extension.pm
index d8d0dce39..b62b1989c 100644
--- a/extensions/PhabBugz/Extension.pm
+++ b/extensions/PhabBugz/Extension.pm
@@ -38,6 +38,7 @@ sub template_before_process {
       $active_revision_count++ if !$attachment->isobsolete;
       $has_revisions = 1;
     }
+    $vars->{phabricator_content_type} = PHAB_CONTENT_TYPE;
     $vars->{phabricator_revisions} = $has_revisions;
     $vars->{phabricator_active_revision_count} = $active_revision_count;
   }