From be42b87338d3349bf58fe6ba0be9b9207bb28c03 Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Wed, 5 Feb 2020 15:23:35 +0100
Subject: [PATCH] FIX: Allow submitting various forms via keyboard (#8866)

---
 .../admin/templates/badges-award.hbs          |  1 +
 .../admin/templates/badges-show.hbs           |  1 +
 .../admin/templates/customize-themes-show.hbs |  4 +--
 .../admin/templates/user-badges.hbs           |  1 +
 .../admin/templates/users-list.hbs            | 19 +++++++-------
 .../components/group-card-contents.hbs        |  8 +++---
 .../discourse/templates/email-login.hbs       |  9 ++++---
 .../discourse/templates/groups/new.hbs        | 10 +++++---
 .../discourse/templates/invites/show.hbs      |  1 +
 .../templates/modal/forgot-password.hbs       | 25 ++++++++++---------
 .../modal/second-factor-backup-edit.hbs       |  1 +
 .../discourse/templates/preferences-email.hbs |  1 +
 .../templates/preferences-username.hbs        |  1 +
 13 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/badges-award.hbs b/app/assets/javascripts/admin/templates/badges-award.hbs
index d7a24e0651c..423c40883c3 100644
--- a/app/assets/javascripts/admin/templates/badges-award.hbs
+++ b/app/assets/javascripts/admin/templates/badges-award.hbs
@@ -25,6 +25,7 @@
       {{d-button
           class="btn-primary"
           action=(action 'massAward')
+          type="submit"
           disabled=saving
           label="admin.badges.mass_award.perform"}}
       {{#link-to 'adminBadges.index' class="btn btn-danger"}}
diff --git a/app/assets/javascripts/admin/templates/badges-show.hbs b/app/assets/javascripts/admin/templates/badges-show.hbs
index 3349e5e6f7d..22059535e77 100644
--- a/app/assets/javascripts/admin/templates/badges-show.hbs
+++ b/app/assets/javascripts/admin/templates/badges-show.hbs
@@ -158,6 +158,7 @@
       {{d-button
         class="btn-primary"
         action=(action "save")
+        type="submit"
         disabled=saving
         label="admin.badges.save"}}
       <span class='saving'>{{savingStatus}}</span>
diff --git a/app/assets/javascripts/admin/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
index b2039850562..092991f1a32 100644
--- a/app/assets/javascripts/admin/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/templates/customize-themes-show.hbs
@@ -255,8 +255,8 @@
         action=(action "enableComponent")
         icon="check"
         label="admin.customize.theme.enable"}}
-      {{/if}}
     {{/if}}
+  {{/if}}
 
-    {{d-button action=(action "destroy") label="admin.customize.delete" icon="trash-alt" class="btn-danger"}}
+  {{d-button action=(action "destroy") label="admin.customize.delete" icon="trash-alt" class="btn-danger"}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/user-badges.hbs b/app/assets/javascripts/admin/templates/user-badges.hbs
index 6b6716b4847..f4e7a63e2ab 100644
--- a/app/assets/javascripts/admin/templates/user-badges.hbs
+++ b/app/assets/javascripts/admin/templates/user-badges.hbs
@@ -30,6 +30,7 @@
       {{d-button
         class="btn-primary"
         action=(action "grantBadge")
+        type="submit"
         label="admin.badges.grant"}}
     </form>
     {{/if}}
diff --git a/app/assets/javascripts/admin/templates/users-list.hbs b/app/assets/javascripts/admin/templates/users-list.hbs
index f11dcdd4085..b533e10d921 100644
--- a/app/assets/javascripts/admin/templates/users-list.hbs
+++ b/app/assets/javascripts/admin/templates/users-list.hbs
@@ -9,17 +9,18 @@
       {{nav-item route='adminUsersList.show' routeParam='suspect' label='admin.users.nav.suspect'}}
       {{nav-item route='adminUsersList.show' routeParam='staged' label='admin.users.nav.staged'}}
       {{nav-item route='groups' label='groups.index.title'}}
-      <div class="admin-actions">
-    {{#if currentUser.can_invite_to_forum}}
-      {{d-button class="btn-default" action=(route-action "sendInvites") title="admin.invite.button_title" icon="user-plus" label="admin.invite.button_text"}}
-    {{/if}}
-    {{#if currentUser.admin}}
-      {{d-button class="btn-default" action=(route-action "exportUsers") title="admin.export_csv.button_title.user" icon="download" label="admin.export_csv.button_text"}}
-    {{/if}}
-  </div>
+
+      <li class="admin-actions">
+        {{#if currentUser.can_invite_to_forum}}
+          {{d-button class="btn-default" action=(route-action "sendInvites") title="admin.invite.button_title" icon="user-plus" label="admin.invite.button_text"}}
+        {{/if}}
+
+        {{#if currentUser.admin}}
+          {{d-button class="btn-default" action=(route-action "exportUsers") title="admin.export_csv.button_title.user" icon="download" label="admin.export_csv.button_text"}}
+        {{/if}}
+      </li>
     </ul>
   </nav>
-
 </div>
 
 <div class="admin-container">
diff --git a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
index 962f710ab48..eee2b12ed09 100644
--- a/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-card-contents.hbs
@@ -32,10 +32,10 @@
         {{#if group.messageable}}
           <li>
             {{d-button
-          action=(action "messageGroup")
-          class="btn-primary group-message-button inline"
-          icon="envelope"
-          label="groups.message"}}
+              action=(action "messageGroup")
+              class="btn-primary group-message-button inline"
+              icon="envelope"
+              label="groups.message"}}
           </li>
         {{/if}}
       </ul>
diff --git a/app/assets/javascripts/discourse/templates/email-login.hbs b/app/assets/javascripts/discourse/templates/email-login.hbs
index 4541fa86898..96ba848bfb5 100644
--- a/app/assets/javascripts/discourse/templates/email-login.hbs
+++ b/app/assets/javascripts/discourse/templates/email-login.hbs
@@ -38,10 +38,13 @@
         {{/if}}
 
         {{#unless model.security_key_required }}
-          {{d-button label="email_login.confirm_button" action=(action "finishLogin") class="btn-primary"}}
-        {{/unless}}    
+          {{d-button
+            label="email_login.confirm_button"
+            action=(action "finishLogin")
+            type="submit"
+            class="btn-primary"}}
+        {{/unless}}
       {{/if}}
     </form>
   </div>
 </div>
-
diff --git a/app/assets/javascripts/discourse/templates/groups/new.hbs b/app/assets/javascripts/discourse/templates/groups/new.hbs
index 270badf6c2e..68210220f04 100644
--- a/app/assets/javascripts/discourse/templates/groups/new.hbs
+++ b/app/assets/javascripts/discourse/templates/groups/new.hbs
@@ -28,10 +28,12 @@
     {{groups-form-interaction-fields model=model}}
 
     <div class='control-group buttons'>
-      {{d-button action=(action "save")
-          disabled=saving
-          class='btn btn-primary group-form-save'
-          label="admin.groups.new.create"}}
+      {{d-button
+        action=(action "save")
+        type="submit"
+        disabled=saving
+        class='btn btn-primary group-form-save'
+        label="admin.groups.new.create"}}
 
       {{#link-to "groups"}}
         {{i18n 'cancel'}}
diff --git a/app/assets/javascripts/discourse/templates/invites/show.hbs b/app/assets/javascripts/discourse/templates/invites/show.hbs
index 792e75640ca..1946d8c58cc 100644
--- a/app/assets/javascripts/discourse/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/templates/invites/show.hbs
@@ -59,6 +59,7 @@
           {{d-button
             class="btn-primary"
             action=(action "submit")
+            type="submit"
             disabled=submitDisabled
             label="invites.accept_invite"}}
 
diff --git a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
index 6ccead6258e..8d438dd80ae 100644
--- a/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/forgot-password.hbs
@@ -1,22 +1,17 @@
 <form>
   {{#d-modal-body class="forgot-password-modal"}}
-    {{#unless offerHelp}}
+    {{#if offerHelp}}
+      {{{offerHelp}}}
+    {{else}}
       <label for='username-or-email'>{{i18n 'forgot_password.invite'}}</label>
       {{text-field value=accountEmailOrUsername placeholderKey="login.email_placeholder" id="username-or-email" autocorrect="off" autocapitalize="off"}}
-    {{else}}
-      {{{offerHelp}}}
-    {{/unless}}
+    {{/if}}
   {{/d-modal-body}}
   <div class="modal-footer">
-    {{#unless offerHelp}}
-      {{d-button action=(action "resetPassword")
-                 label="forgot_password.reset"
-                 disabled=submitDisabled
-                 class="btn-primary forgot-password-reset"
-                 type='submit'}}
-    {{else}}
+    {{#if offerHelp}}
       {{d-button class="btn-large btn-primary"
                  label="forgot_password.button_ok"
+                 type="submit"
                  action=(action "ok")}}
       {{#unless helpSeen}}
         {{d-button class="btn-large"
@@ -24,6 +19,12 @@
                    icon="question-circle"
                    action=(action "help")}}
       {{/unless}}
-    {{/unless}}
+    {{else}}
+      {{d-button action=(action "resetPassword")
+                 label="forgot_password.reset"
+                 disabled=submitDisabled
+                 class="btn-primary forgot-password-reset"
+                 type='submit'}}
+    {{/if}}
   </div>
 </form>
diff --git a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs b/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
index 83aa04e1b04..5981f4a1183 100644
--- a/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/second-factor-backup-edit.hbs
@@ -21,6 +21,7 @@
       {{d-button
         class="btn-primary"
         action=(action "generateSecondFactorCodes")
+        type="submit"
         disabled=loading
         label=generateBackupCodeBtnLabel}}
       {{#if backupEnabled}}
diff --git a/app/assets/javascripts/discourse/templates/preferences-email.hbs b/app/assets/javascripts/discourse/templates/preferences-email.hbs
index 6b5fac0539a..d335e0fafb2 100644
--- a/app/assets/javascripts/discourse/templates/preferences-email.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-email.hbs
@@ -52,6 +52,7 @@
           {{#d-button
             class="btn-primary"
             action=(action "changeEmail")
+            type="submit"
             disabled=saveDisabled
           }}
             {{saveButtonText}}
diff --git a/app/assets/javascripts/discourse/templates/preferences-username.hbs b/app/assets/javascripts/discourse/templates/preferences-username.hbs
index d2c94136c69..b1550b9c167 100644
--- a/app/assets/javascripts/discourse/templates/preferences-username.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences-username.hbs
@@ -27,6 +27,7 @@
         {{#d-button
           class="btn-primary"
           action=(action "changeUsername")
+          type="submit"
           disabled=saveDisabled
         }}
           {{saveButtonText}}