From c92cf57e4cb4188e53477ee08c6617b140b46253 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Sat, 22 Aug 2020 16:02:10 +0200
Subject: [PATCH] Actually honor the autofocus setting

This rectifies commits 1b1301d9622c72c1d947cc220d70f949a2f03d6f and
35c7ba82a28bc53829baa76aaffa2046ff6e6995.

(cherry picked from commit af3b1f025788f18d711ba978ea0839fbbbfea840)
---
 deform/templates/checkbox_choice.pt | 2 +-
 deform/templates/radio_choice.pt    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deform/templates/checkbox_choice.pt b/deform/templates/checkbox_choice.pt
index c6667e18..0f3efaba 100644
--- a/deform/templates/checkbox_choice.pt
+++ b/deform/templates/checkbox_choice.pt
@@ -14,7 +14,7 @@
       <input tal:attributes="checked value in cstruct;
                              class css_class;
                              style style;
-                             autofocus not repeat.choice.index;
+                             autofocus not repeat.choice.index and autofocus;
                              attributes|field.widget.attributes|{};"
              type="checkbox"
              name="checkbox"
diff --git a/deform/templates/radio_choice.pt b/deform/templates/radio_choice.pt
index 9dd30b2d..811ed8f5 100644
--- a/deform/templates/radio_choice.pt
+++ b/deform/templates/radio_choice.pt
@@ -14,7 +14,7 @@
       <input tal:attributes="checked value == cstruct;
                              class css_class;
                              style style;
-                             autofocus not repeat.choice.index;
+                             autofocus not repeat.choice.index and autofocus;
                              attributes|field.widget.attributes|{};"
              type="radio"
              name="${oid}"