From 4794e8436f2dd0a808fc63ed30a1f6d3aabc7e1d Mon Sep 17 00:00:00 2001
From: Kohei Yoshino <kohei.yoshino@gmail.com>
Date: Wed, 24 Apr 2019 15:16:27 -0400
Subject: [PATCH] Bug 1546539 - [SEO] Many legacy and printable bug pages are
 cached by Google

---
 extensions/BugModal/Extension.pm              | 12 ++++++++++-
 .../en/default/bug_modal/edit.html.tmpl       |  6 ------
 qa/t/test_bug_edit.t                          | 13 +-----------
 qa/t/test_custom_fields.t                     |  6 ------
 qa/t/test_long_list_redirection.t             | 20 -------------------
 template/en/default/bug/navigate.html.tmpl    |  5 +----
 .../default/global/site-navigation.html.tmpl  |  2 --
 7 files changed, 13 insertions(+), 51 deletions(-)
 delete mode 100644 qa/t/test_long_list_redirection.t

diff --git a/extensions/BugModal/Extension.pm b/extensions/BugModal/Extension.pm
index 92240cc04..e6064424f 100644
--- a/extensions/BugModal/Extension.pm
+++ b/extensions/BugModal/Extension.pm
@@ -49,7 +49,17 @@ sub _alternative_show_bug_format {
     return '' if $ctype ne 'html';
   }
   if (my $format = $cgi->param('format')) {
-    return ($format eq '__default__' || $format eq 'default') ? '' : $format;
+    my @ids = $cgi->param('id');
+    # Drop `format=default` as well as `format=multiple`, if a single bug ID is
+    # provided, by redirecting to the modal UI (301 Moved Permanently)
+    if ($format eq '__default__' || $format eq 'default'
+      || ($format eq 'multiple' && scalar(@ids) == 1))
+    {
+      $cgi->base_redirect('show_bug.cgi?id=' . $cgi->param('id'), 1);
+    }
+    # Otherwise, printable `format=multiple` is still available from bug lists
+    # as the Long Format option
+    return $format;
   }
   return $user->setting('ui_experiments') eq 'on' ? 'modal' : '';
 }
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 3976a1085..f162ec5d9 100644
--- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
@@ -1405,15 +1405,9 @@
       <button type="button" id="format-btn" aria-haspopup="true" aria-label="Format [% terms.Bug %] Menu"
         aria-expanded="false" aria-controls="format-menu" class="dropdown-button minor">Format [% terms.Bug %] &#9652;</button>
       <ul class="dropdown-content left menu-up" id="format-menu" role="menu" style="display:none;">
-        <li role="presentation">
-          <a href="[% basepath FILTER none %]show_bug.cgi?format=multiple&amp;id=[% bug.id FILTER uri %]" role="menuitem" tabindex="-1">For Printing</a>
-        </li>
         <li role="presentation">
           <a href="[% basepath FILTER none %]show_bug.cgi?ctype=xml&amp;id=[% bug.id FILTER uri %]" role="menuitem" tabindex="-1">XML</a>
         </li>
-        <li role="presentation">
-          <a href="[% basepath FILTER none %]show_bug.cgi?format=default&amp;id=[% bug.id FILTER uri %]" role="menuitem" tabindex="-1">Legacy</a>
-        </li>
         [% IF bug.groups_in.size == 0 %]
           <li role="presentation">
             <a href="[% basepath FILTER none %]rest/bug/[% bug.id FILTER uri %]" role="menuitem" tabindex="-1">JSON</a>
diff --git a/qa/t/test_bug_edit.t b/qa/t/test_bug_edit.t
index b9fcd3d93..bf68a24aa 100644
--- a/qa/t/test_bug_edit.t
+++ b/qa/t/test_bug_edit.t
@@ -320,7 +320,7 @@ $sel->is_text_present_ok(
   "You are not permitted to edit bugs in product TestProduct.");
 logout($sel);
 
-# Test searches and "format for printing".
+# Test searches.
 
 log_in($sel, $config, 'admin');
 open_advanced_search_page($sel);
@@ -359,17 +359,6 @@ check_page_load($sel, WAIT_TIME,
   q{http://HOSTNAME:8000/buglist.cgi?cmdtype=runnamed&namedcmd=My%20bugs%20from%20QA_Selenium&list_id=17}
 );
 $sel->title_is("Bug List: My bugs from QA_Selenium");
-$sel->click_ok("long_format");
-check_page_load($sel, WAIT_TIME, q{http://HOSTNAME:8000/show_bug.cgi});
-$sel->title_is("Full Text Bug Listing");
-$sel->is_text_present_ok("Bug $bug1_id");
-$sel->is_text_present_ok("Status: CONFIRMED");
-$sel->is_text_present_ok(
-  "Reporter: QA-Selenium-TEST <$config->{QA_Selenium_TEST_user_login}>");
-$sel->is_text_present_ok("Assignee: QA Admin <$config->{admin_user_login}>");
-$sel->is_text_present_ok("Severity: blocker");
-$sel->is_text_present_ok("Priority: Highest");
-$sel->is_text_present_ok("I have no privs, I can only comment");
 logout($sel);
 
 # Let's create a 2nd bug by this user so that we can test mass-change
diff --git a/qa/t/test_custom_fields.t b/qa/t/test_custom_fields.t
index 5c0a09e40..62fdfaa25 100644
--- a/qa/t/test_custom_fields.t
+++ b/qa/t/test_custom_fields.t
@@ -225,12 +225,6 @@ edit_bug_and_return($sel, $bug1_id, $bug_summary);
 $sel->select_ok("bug_status", "IN_QA");
 edit_bug_and_return($sel, $bug1_id, $bug_summary);
 
-$sel->click_ok("link=Format For Printing");
-$sel->wait_for_page_to_load_ok(WAIT_TIME);
-$sel->title_is("Full Text Bug Listing");
-$sel->is_text_present_ok("Freetext$bug1_id: dumbo");
-$sel->is_text_present_ok("List$bug1_id: storage");
-$sel->is_text_present_ok("Status: IN_QA UPSTREAM");
 go_to_bug($sel, $bug2_id);
 $sel->select_ok("cf_qa_list_$bug1_id", "label=storage");
 edit_bug($sel, $bug2_id);
diff --git a/qa/t/test_long_list_redirection.t b/qa/t/test_long_list_redirection.t
deleted file mode 100644
index 6f4509a21..000000000
--- a/qa/t/test_long_list_redirection.t
+++ /dev/null
@@ -1,20 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-use strict;
-use warnings;
-use lib qw(lib ../../lib ../../local/lib/perl5);
-use Test::More "no_plan";
-use QA::Util;
-
-my ($sel, $config) = get_selenium();
-
-$sel->open_ok("/long_list.cgi?id=1");
-$sel->title_is("Full Text Bug Listing", "Display bug as format for printing");
-my $text = $sel->get_text('//*[@id="bugzilla-body"]//h1');
-$text =~ s/[\r\n\t\s]+/ /g;
-is($text, 'Bug 1', 'Display bug 1 specifically');
diff --git a/template/en/default/bug/navigate.html.tmpl b/template/en/default/bug/navigate.html.tmpl
index 7a98297f0..ae368cc26 100644
--- a/template/en/default/bug/navigate.html.tmpl
+++ b/template/en/default/bug/navigate.html.tmpl
@@ -24,10 +24,7 @@
 [% PROCESS global/variables.none.tmpl %]
 [% IF bottom_navigator == 1 %]
   <ul class="related_actions">
-    <li><a href="[% basepath FILTER none %]show_bug.cgi?format=multiple&amp;id=
-                [% bug.bug_id FILTER uri %]">Format For Printing</a></li>
-    <li>&nbsp;-&nbsp;<a href="[% basepath FILTER none %]show_bug.cgi?ctype=xml&amp;id=
-                        [% bug.bug_id  FILTER uri %]">XML</a></li>
+    <li><a href="[% basepath FILTER none %]show_bug.cgi?ctype=xml&amp;id=[% bug.bug_id FILTER uri %]">XML</a></li>
     [% IF NOT bug.groups_in.size %]
       <li>&nbsp;-&nbsp;<a href="[% basepath FILTER none %]rest/bug/[% bug.bug_id  FILTER uri %]">JSON</a></li>
     [% END %]
diff --git a/template/en/default/global/site-navigation.html.tmpl b/template/en/default/global/site-navigation.html.tmpl
index d95ae68db..31ec0be98 100644
--- a/template/en/default/global/site-navigation.html.tmpl
+++ b/template/en/default/global/site-navigation.html.tmpl
@@ -48,8 +48,6 @@
 
       <link rel="Show" title="[% terms.Bug %] Activity"
             href="[% basepath FILTER none %]show_activity.cgi?id=[% bug.bug_id %]">
-      <link rel="Show" title="Printer-Friendly Version"
-            href="[% basepath FILTER none %]show_bug.cgi?format=multiple&amp;id=[% bug.bug_id %]">
   [% END %]
 
 
-- 
2.47.3