From b101d2e50922127e2fff2fd5b321d8ae0f41dfa3 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Wed, 13 May 2020 11:08:42 +0200
Subject: [PATCH] Disable checkbox properly when it contains label

---
 api/js/etemplate/et2_widget_checkbox.ts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/api/js/etemplate/et2_widget_checkbox.ts b/api/js/etemplate/et2_widget_checkbox.ts
index a490dcec71..083b1f0006 100644
--- a/api/js/etemplate/et2_widget_checkbox.ts
+++ b/api/js/etemplate/et2_widget_checkbox.ts
@@ -189,6 +189,23 @@ class et2_checkbox extends et2_inputWidget
 			return this.options.unselected_value;
 		}
 	}
+
+	set_disabled(_value)
+	{
+		let parentNode = jQuery(this.getDOMNode()).parent();
+		if (parentNode[0] && parentNode[0].nodeName == "label" && parentNode.hasClass('.et2_checkbox_label'))
+		{
+			if (_value)
+			{
+				parentNode.hide();
+			}
+			else
+			{
+				parentNode.show();
+			}
+		}
+		super.set_disabled(_value);
+	}
 }
 et2_register_widget(et2_checkbox, ["checkbox"]);