From 230258e7c6a038696e4691aebd7409e61e8bc4c8 Mon Sep 17 00:00:00 2001
From: David <79108364+Phpvarious@users.noreply.github.com>
Date: Fri, 14 Jul 2023 23:00:14 +0200
Subject: [PATCH 1/2] Update cmd.configure.php

---
 desktop/modal/cmd.configure.php | 40 +++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/desktop/modal/cmd.configure.php b/desktop/modal/cmd.configure.php
index 84790c63b9..bcbbe4fc08 100644
--- a/desktop/modal/cmd.configure.php
+++ b/desktop/modal/cmd.configure.php
@@ -995,24 +995,30 @@
         })
       },
       displayWidgetHelp: function(_widgetName) {
-        jeedom.cmd.getWidgetHelp({
-          id: document.querySelector('#cmd_information span[data-l1key="id"]').textContent,
-          version: 'dashboard',
-          widgetName: _widgetName,
-          error: function(error) {
-            document.getElementById('optionalParamHelp').empty().textContent = '{{Pas de description des paramètres optionnels sur ce Widget.}}'
-          },
-          success: function(data) {
-            document.getElementById('optionalParamHelp').empty().innerHTML = data.html
-          }
-        })
+        if (document.getElementById('optionalParamHelp')) {
+          jeedom.cmd.getWidgetHelp({
+            id: document.querySelector('#cmd_information span[data-l1key="id"]').textContent,
+            version: 'dashboard',
+            widgetName: _widgetName,
+            error: function(error) {
+              document.getElementById('optionalParamHelp').empty().textContent = '{{Pas de description des paramètres optionnels sur ce Widget.}}'
+            },
+            success: function(data) {
+              document.getElementById('optionalParamHelp').empty().innerHTML = data.html
+            }
+          })
+        }
       },
       synchModalToCmd: function() {
         var cmdId = document.querySelector('#div_displayCmdConfigure .cmdAttr[data-l1key="id"]').textContent
         var cmdTr = document.querySelector('#div_pageContainer tr[data-cmd_id="' + cmdId + '"]')
         if (cmdTr) {
-          cmdTr.querySelector('input.cmdAttr[data-l1key="isVisible"]').checked = document.querySelector('#div_displayCmdConfigure input.cmdAttr[data-l1key="isVisible"').checked
-          cmdTr.querySelector('.cmdAttr[data-l1key="display"][data-l2key="icon"]').innerHTML = document.querySelector('#div_displayCmdConfigure .cmdAttr[data-l1key="display"][data-l2key="icon"]').innerHTML
+          if (cmdTr.querySelector('input.cmdAttr[data-l1key="isVisible"]')) {
+            cmdTr.querySelector('input.cmdAttr[data-l1key="isVisible"]').checked = document.querySelector('#div_displayCmdConfigure input.cmdAttr[data-l1key="isVisible"').checked
+          }
+          if (cmdTr.querySelector('.cmdAttr[data-l1key="display"][data-l2key="icon"]')) {
+            cmdTr.querySelector('.cmdAttr[data-l1key="display"][data-l2key="icon"]').innerHTML = document.querySelector('#div_displayCmdConfigure .cmdAttr[data-l1key="display"][data-l2key="icon"]').innerHTML
+          }
         }
       },
       syncModalToScenario: function() {
@@ -1085,7 +1091,7 @@
         if (!isset(cmd.display)) cmd.display = {}
         if (!isset(cmd.display.parameters)) cmd.display.parameters = {}
 
-        document.querySelector('#cmd_display #table_widgetParametersCmd').tBodies[0].childNodes.forEach(_tr => {
+        document.querySelector('#cmd_display #table_widgetParametersCmd')?.tBodies[0].childNodes.forEach(_tr => {
           if (_tr.nodeType != 3) {
             cmd.display.parameters[_tr.querySelector('.key').jeeValue()] = _tr.querySelector('.value').jeeValue()
           }
@@ -1135,12 +1141,12 @@
         if (!isset(cmd.display.parameters)) cmd.display.parameters = {}
 
         if (document.querySelector('#cmd_display #table_widgetParametersCmd')) { 
-          document.querySelector('#cmd_display #table_widgetParametersCmd').tBodies[0].childNodes.forEach(_tr => {
+          document.querySelector('#cmd_display #table_widgetParametersCmd')?.tBodies[0].childNodes.forEach(_tr => {
             if (_tr.nodeType != 3) {
               cmd.display.parameters[_tr.querySelector('.key').jeeValue()] = _tr.querySelector('.value').jeeValue()
             }
           })
-        }
+        } else delete cmd.display.parameters;
 
         try {
           var checkCmdParameter = document.getElementById('div_jeedomCheckCmdCmdOption').getJeeValues('.expressionAttr')[0]
@@ -1574,4 +1580,4 @@
 
     jeeM.postInit()
   })()
-</script>
\ No newline at end of file
+</script>

From 748c6337a9856bba05998dea73ef021d68414ac8 Mon Sep 17 00:00:00 2001
From: David <79108364+Phpvarious@users.noreply.github.com>
Date: Fri, 14 Jul 2023 23:00:22 +0200
Subject: [PATCH 2/2] Update cmd.class.php

---
 core/class/cmd.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/class/cmd.class.php b/core/class/cmd.class.php
index 1b47374a64..b7a345ac2e 100644
--- a/core/class/cmd.class.php
+++ b/core/class/cmd.class.php
@@ -2508,6 +2508,9 @@ public function widgetPossibility($_key = '', $_default = true) {
 		if (property_exists($class, '_widgetPossibility')) {
 			$return = $class::$_widgetPossibility;
 			if ($_key != '') {
+				if (isset($return[$_key])) {
+					return $return[$_key];
+				}
 				$keys = explode('::', $_key);
 				foreach ($keys as $k) {
 					if (!isset($return[$k])) {