From 702e0ee7437c6fea441fa5d1f109e3b4a032a2b4 Mon Sep 17 00:00:00 2001
From: Kohei Yoshino <kohei.yoshino@gmail.com>
Date: Thu, 28 Mar 2019 15:39:49 -0400
Subject: [PATCH] Bug 1539849 - Multiple uplift request is not working as
 expected

---
 .../en/default/hook/flag/type_comment-form.html.tmpl      | 8 ++++----
 extensions/FlagTypeComment/web/js/ftc.js                  | 2 +-
 template/en/default/flag/list.html.tmpl                   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/extensions/BMO/template/en/default/hook/flag/type_comment-form.html.tmpl b/extensions/BMO/template/en/default/hook/flag/type_comment-form.html.tmpl
index 4cbe7df17..325cb84a4 100644
--- a/extensions/BMO/template/en/default/hook/flag/type_comment-form.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/flag/type_comment-form.html.tmpl
@@ -8,7 +8,7 @@
 
 <meta name="extra-patch-types" content="text/x-phabricator-request">
 
-<template class="approval-request" data-flags="approval‑mozilla‑beta approval‑mozilla‑release">
+<template class="approval-request" data-flags="approval-mozilla-beta approval-mozilla-release">
   <section>
     <header>
       <h3>Beta/Release Uplift Approval Request</h3>
@@ -80,7 +80,7 @@
   </section>
 </template>
 
-<template class="approval-request" data-flags="approval‑mozilla‑esr*">
+<template class="approval-request" data-flags="approval-mozilla-esr*">
   <section>
     <header>
       <h3>ESR Uplift Approval Request</h3>
@@ -123,7 +123,7 @@
   </section>
 </template>
 
-<template class="approval-request" data-flags="approval‑mozilla‑geckoview*">
+<template class="approval-request" data-flags="approval-mozilla-geckoview*">
   <section>
     <header>
       <h3>GeckoView Uplift Approval Request</h3>
@@ -166,7 +166,7 @@
   </section>
 </template>
 
-<template class="approval-request" data-flags="sec‑approval">
+<template class="approval-request" data-flags="sec-approval">
   <section>
     <header>
       <h3>Security Approval Request</h3>
diff --git a/extensions/FlagTypeComment/web/js/ftc.js b/extensions/FlagTypeComment/web/js/ftc.js
index 855ca7748..5756d06c1 100644
--- a/extensions/FlagTypeComment/web/js/ftc.js
+++ b/extensions/FlagTypeComment/web/js/ftc.js
@@ -121,7 +121,7 @@ Bugzilla.FlagTypeComment = class FlagTypeComment {
   create_comment($fieldset) {
     return [
       `### ${$fieldset.querySelector('h3').innerText}`,
-      ...[...$fieldset.querySelectorAll('tr')].map($tr => {
+      ...[...$fieldset.querySelectorAll('tr:not(.other-patches)')].map($tr => {
         const checkboxes = [...$tr.querySelectorAll('input[type="checkbox"]:checked')];
         const $radio = $tr.querySelector('input[type="radio"]:checked');
         const $input = $tr.querySelector('textarea,select,input');
diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl
index bb191e1dd..653c1aac6 100644
--- a/template/en/default/flag/list.html.tmpl
+++ b/template/en/default/flag/list.html.tmpl
@@ -131,7 +131,7 @@
                 title="[% type.description FILTER html %]"
                 onchange="toggleRequesteeField(this);"
                 class="flag_select flag_type-[% type.id %]"
-                data-id="[% type.id %]" data-name="[% type.name FILTER html FILTER no_break %]"
+                data-id="[% type.id %]" data-name="[% type.name FILTER html %]"
                 [% IF !can_edit_flag %] disabled="disabled"[% END %]>
         [% IF dontchange %]
           <option value="[% dontchange FILTER html %]" selected>[% dontchange FILTER html %]</option>
-- 
2.47.3