From e0004625c4bd9e2053a586bf45e03f7f8ed66e5f Mon Sep 17 00:00:00 2001
From: David Lawrence <dkl@mozilla.com>
Date: Thu, 22 Sep 2016 20:19:01 +0000
Subject: Bug 1304845 - The nda legal form is not working properly and does not
 allowed being submitted to misconfigured required field

---
 .../template/en/default/bug/create/create-nda.html.tmpl  | 16 +++++++++++-----
 .../en/default/bug/create/custom_forms.none.tmpl         |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/extensions/BMO/template/en/default/bug/create/create-nda.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-nda.html.tmpl
index a03a5ca0f..2d766493a 100644
--- a/extensions/BMO/template/en/default/bug/create/create-nda.html.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/create-nda.html.tmpl
@@ -35,12 +35,18 @@
 [% inline_javascript = BLOCK %]
 $(function() {
   $('#nda_needed').on('change', function() {
-    if ($('#nda_needed').val() == 'Yes')
+    if ($('#nda_needed').val() == 'Yes') {
       $('#nda_needed_reason_row').show();
-      $('#nda_needed_reason').attr('disabled', false);
-    else
+    } else {
       $('#nda_needed_reason_row').hide();
-      $('#nda_needed_reason').attr('disabled', true);
+    }
+  });
+  $('#ndaForm').submit(function () {
+    if ($('#nda_needed').val() == 'Yes' && $('#nda_needed_reason').val() == '') {
+      alert('Please explain why confidential information needs to be shared at this stage.');
+      return false;
+    }
+    return true;
   });
 });
 [% END %]
@@ -93,7 +99,7 @@ $(function() {
         <strong>If yes, please explain.</strong>
       </label>
     </div>
-    <textarea required="true"  name="nda_needed_reason" id="nda_needed_reason" cols="80" rows="10"></textarea>
+    <textarea name="nda_needed_reason" id="nda_needed_reason" cols="80" rows="10"></textarea>
   </div>
 
   <div class="row">
diff --git a/extensions/BMO/template/en/default/bug/create/custom_forms.none.tmpl b/extensions/BMO/template/en/default/bug/create/custom_forms.none.tmpl
index 9ec71766b..0b6ca7179 100644
--- a/extensions/BMO/template/en/default/bug/create/custom_forms.none.tmpl
+++ b/extensions/BMO/template/en/default/bug/create/custom_forms.none.tmpl
@@ -223,7 +223,7 @@ custom_forms = {
       link  => 'form.moz.project.review'
     },
     {
-      title => 'Independant Contractor Request',
+      title => 'Independent Contractor Request',
       link  => 'form.moz.project.review'
     },
     {
-- 
cgit v1.2.3-24-g4f1b