Merge branch 'master' into beta

jeedom · Mar 5, 2024 · 2bc51cb · 2bc51cb
2 parents 733fe4f + c4caccb
commit 2bc51cb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/desktop/modal/device.php b/desktop/modal/device.php
@@ -53,15 +53,15 @@
                             {{Nom :}}
                             <b><span class="label label-default" style="font-size : 1em;"><?php echo $eqLogic->getHumanName() ?></span></b>
                             {{Modèle :}}
-                            <b><span class="label label-default" style="font-size : 1em;"><?php echo $infos['definition']['model'] ?></span></b>
+                            <b><span class="label label-default" style="font-size : 1em;"><?php echo @$infos['definition']['model'] ?></span></b>
                             {{Fabricant :}}
-                            <b><span class="label label-default" style="font-size : 1em;"><?php echo $infos['manufacturer'] ?></span></b>
+                            <b><span class="label label-default" style="font-size : 1em;"><?php echo @$infos['manufacturer'] ?></span></b>
                             {{Vendeur :}}
-                            <b><span class="label label-default" style="font-size : 1em;"><?php echo $infos['definition']['vendor'] ?></span></b>
+                            <b><span class="label label-default" style="font-size : 1em;"><?php echo @$infos['definition']['vendor'] ?></span></b>
                             {{Modèle ID :}}
-                            <b><span class="label label-default" style="font-size : 1em;"><?php echo $infos['model_id'] ?></span></b>
+                            <b><span class="label label-default" style="font-size : 1em;"><?php echo @$infos['model_id'] ?></span></b>
                             {{Type :}}
-                            <b><span class="label label-default" style="font-size : 1em;"><?php echo $infos['type'] ?></span></b>
+                            <b><span class="label label-default" style="font-size : 1em;"><?php echo @$infos['type'] ?></span></b>
                             <br />
                             {{Interview en cours :}}
                             <?php
@@ -81,10 +81,10 @@
                             ?>
                             <br />
                             {{Alimentation :}}
-                            <b><span class="label label-default" style="font-size : 1em;"><?php echo $infos['power_source'] ?></span></b>
+                            <b><span class="label label-default" style="font-size : 1em;"><?php echo @$infos['power_source'] ?></span></b>
                             <br />
                             {{Software :}}
-                            <b><span class="label label-default" style="font-size : 1em;"><?php echo $infos['software_build_id'] ?></span></b>
+                            <b><span class="label label-default" style="font-size : 1em;"><?php echo @$infos['software_build_id'] ?></span></b>
                             {{Support OTA :}}
                             <?php
                             if ($infos['definition']['supports_ota']) {
@@ -101,7 +101,7 @@
                         <h4 class="panel-title"><i class="fas fa-info-circle"></i> {{Description}}</h4>
                     </div>
                     <div class="panel-body">
-                        <b><span class="label label-default" style="font-size : 1em;"><?php echo $infos['definition']['description'] ?></span></b>
+                        <b><span class="label label-default" style="font-size : 1em;"><?php echo @$infos['definition']['description'] ?></span></b>
                         </p>
                     </div>
                 </div>
@@ -159,7 +159,7 @@
                 <?php
                 $current_value = $bridge_info['config']['devices'][z2m::convert_from_addr($eqLogic->getLogicalId())];
                 foreach ($infos['definition']['options'] as $option) {
-                    if ($option['access'] == 1) {
+                    if (!isset($option['access']) || $option['access'] == 1) {
                         continue;
                     }
                     echo '<tr>';

diff --git a/docs/fr_FR/changelog.md b/docs/fr_FR/changelog.md
@@ -15,6 +15,11 @@
 - Amélioration de la detection du mode inclusion
 - Correction de bug (le plugin ignore maintenant les valeurs vide pour les commandes)
 
+# 19/02/2024
+
+- Correction d'un soucis sur l'installation de mqtt
+
+
 # 17/01/2024
 
 - Amélioration de la mise à jour du firmware sur Luna