From 172832f353b9befc92ce75c5fb0c564a6ec1bf03 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 18 Nov 2019 13:26:26 +0000
Subject: [PATCH] DEV: Submit forms via `type=submit` button, not explicit form
 action (#8368)

---
 .../discourse/templates/modal/forgot-password.hbs            | 5 +++--
 .../discourse/templates/preferences-second-factor.hbs        | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
index 473fbd9e38f..6ccead6258e 100644
--- a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
@@ -1,4 +1,4 @@
-<form {{action "resetPassword" on="submit"}}>
+<form>
   {{#d-modal-body class="forgot-password-modal"}}
     {{#unless offerHelp}}
       <label for='username-or-email'>{{i18n 'forgot_password.invite'}}</label>
@@ -12,7 +12,8 @@
       {{d-button action=(action "resetPassword")
                  label="forgot_password.reset"
                  disabled=submitDisabled
-                 class="btn-primary forgot-password-reset"}}
+                 class="btn-primary forgot-password-reset"
+                 type='submit'}}
     {{else}}
       {{d-button class="btn-large btn-primary"
                  label="forgot_password.button_ok"
diff --git a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
index 675e005c397..5b0da4457ed 100644
--- a/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-second-factor.hbs
@@ -1,6 +1,6 @@
 <section class='user-preferences solo-preference second-factor'>
   {{#conditional-loading-spinner condition=loading}}
-  <form class="form-horizontal" {{action "confirmPassword" on="submit"}}>
+  <form class="form-horizontal">
 
     {{#if showEnforcedNotice}}
       <div class="control-group">