From: Kohei Yoshino <kohei.yoshino@gmail.com>
Date: Thu, 28 Mar 2019 17:36:40 +0000 (-0400)
Subject: Revert "Bug 1534084 - Hide Phablicator requests from Attachment list"
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=744ffca9de466d92826bc0017e330aee6b58a861;p=thirdparty%2Fbugzilla.git

Revert "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 b9291ef3d..1e5da5b95 100644
--- a/extensions/BugModal/template/en/default/bug_modal/attachments.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/attachments.html.tmpl
@@ -24,7 +24,6 @@
         [%~ " 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 0048e4f05..27c50f2a5 100644
--- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
@@ -49,7 +49,6 @@
   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 b62b1989c..d8d0dce39 100644
--- a/extensions/PhabBugz/Extension.pm
+++ b/extensions/PhabBugz/Extension.pm
@@ -38,7 +38,6 @@ 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;
   }