From a4f64e94ccafed3c30cc75a9e6171d882778ca73 Mon Sep 17 00:00:00 2001
From: Raphael Michel <michel@rami.io>
Date: Wed, 23 Feb 2022 13:24:47 +0100
Subject: [PATCH] Settings form: Fix explicit unlocking, fix HTML button type

---
 src/pretix/control/templatetags/hierarkey_form.py | 3 ++-
 src/pretix/static/pretixcontrol/js/ui/main.js     | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pretix/control/templatetags/hierarkey_form.py b/src/pretix/control/templatetags/hierarkey_form.py
index 9f8796fb2..954dcf9ec 100644
--- a/src/pretix/control/templatetags/hierarkey_form.py
+++ b/src/pretix/control/templatetags/hierarkey_form.py
@@ -45,7 +45,8 @@ class PropagatedNode(Node):
             <div class="propagated-settings-box locked panel panel-default">
                 <div class="panel-heading">
                     <input type="hidden" name="_settings_ignore" value="{fnames}">
-                    <button class="btn btn-default pull-right btn-xs" name="decouple" value="{fnames}" data-action="unlink">
+                    <input type="hidden" name="decouple" value="">
+                    <button type="button" class="btn btn-default pull-right btn-xs" value="{fnames}" data-action="unlink">
                         <span class="fa fa-unlock"></span> {text_unlink}
                     </button>
                     <h4 class="panel-title">
diff --git a/src/pretix/static/pretixcontrol/js/ui/main.js b/src/pretix/static/pretixcontrol/js/ui/main.js
index 78b6389d4..f3bb28708 100644
--- a/src/pretix/static/pretixcontrol/js/ui/main.js
+++ b/src/pretix/static/pretixcontrol/js/ui/main.js
@@ -765,6 +765,7 @@ $(function () {
 
     $(".propagated-settings-box button[data-action=unlink]").click(function (ev) {
         var $box = $(this).closest(".propagated-settings-box");
+        $box.find("input[name=decouple]").val($(this).val());
         $box.find("[data-propagated-locked]").prop("readonly", false);
         $box.removeClass("locked").addClass("unlocked");
         ev.preventDefault();