From cfb84c6899369ceeac12511e39693c5ed12f3b21 Mon Sep 17 00:00:00 2001
From: Kohei Yoshino <kohei.yoshino@gmail.com>
Date: Sun, 4 Mar 2018 19:00:54 -0500
Subject: Bug 1429344 - Review requests in requests dropdown should link to
 MozReview or GitHub instead of Bugzilla details page

---
 template/en/default/global/header.html.tmpl | 1 +
 template/en/default/request/queue.json.tmpl | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'template')

diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 428354233..ded28d186 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -107,6 +107,7 @@
     [%- js_BUGZILLA = {
             param => {
                 maxusermatches => Param('maxusermatches'),
+                splinter_base => Param('splinter_base'),
             },
             constant => {
                 COMMENT_COLS => constants.COMMENT_COLS,
diff --git a/template/en/default/request/queue.json.tmpl b/template/en/default/request/queue.json.tmpl
index 7f86072b4..50638de9e 100644
--- a/template/en/default/request/queue.json.tmpl
+++ b/template/en/default/request/queue.json.tmpl
@@ -6,10 +6,9 @@
   # defined by the Mozilla Public License, v. 2.0. #%]
 
 [% RAWPERL %]
-my @display_columns = (
-    "requester", "requestee",      "type",    "status",  "bug_id", "bug_summary",
-    "attach_id", "attach_summary", "ispatch", "created", "category", "restricted"
-);
+my @display_columns = ('requester', 'requestee', 'type', 'created', 'category',
+                       'restricted', 'bug_id', 'bug_summary', 'attach_id',
+                       'attach_summary', 'attach_mimetype', 'attach_ispatch');
 my $requests    = $stash->get('requests');
 my $time_filter = $context->filter('time', [ '%Y-%m-%dT%H:%M:%SZ', 'UTC' ]);
 my $mail_filter = $context->filter('email');
@@ -28,7 +27,7 @@ foreach my $request (@$requests) {
         elsif ( $column =~ /_id$/ ) {
             $val = $request->{$column} ? 0 + $request->{$column} : undef;
         }
-        elsif ( $column =~ /^is/ or $column eq 'restricted' ) {
+        elsif ( $column =~ /^(restricted|attach_ispatch)$/ ) {
             $val = $request->{$column} ? \1 : \0;
         }
         else {
-- 
cgit v1.2.3-24-g4f1b