Templates fix

* Fix for missing icon for device when selected
sergejey · Mar 21, 2021 · fc10f48 · fc10f48
1 parent 420c311
commit fc10f48
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/lib/objects.class.php b/lib/objects.class.php
@@ -1170,15 +1170,14 @@ function processTitle($title, $object = 0)
                 for ($i = 0; $i < $total; $i++) {
                     $property_name = $m[1][$i] . '.' . $m[2][$i];
                     $data = getGlobal($property_name);
-                    if ($data == '') $data = 0;
                     $descr = $m[3][$i];
                     $descr = preg_replace('#(?<!\\\)\;#', ";-;;-;", $descr); 
                     $descr = preg_replace('#\\\;#', ";", $descr); 
                     $tmp = explode(';-;;-;', $descr);
                     $totald = count($tmp);
                     $hsh = array();
                     if ($totald == 1) {
-                        if ($data != 0) {
+                        if ($data != '') {
                             $hsh[$data] = $descr;
                         } else {
                             $hsh[$data] = '';
@@ -1188,14 +1187,19 @@ function processTitle($title, $object = 0)
                             $item = trim($tmp[$id]);
                             if (preg_match('/(.*?)=(.+)/uis', $item, $md)) {
                                 $search_value = $md[1];
+                                if ($search_value=='') $search_value='<empty>';
                                 $search_replace = $md[2];
                             } else {
-                                $search_value = $id;
+                                $search_value = $id.'';
                                 $search_replace = $item;
                             }
                             $hsh[$search_value] = $search_replace;
                         }
-                        if ($data == '') $data='0';
+                        if ($data == '' && isset($hsh['<empty>'])) {
+                            $data = '<empty>';
+                        } elseif ($data == '') {
+                            $data = '0';
+                        }
                     }
                     $title = str_replace($m[0][$i], $hsh[$data], $title);
                 }

diff --git a/templates/classes/views/SOpenable.html b/templates/classes/views/SOpenable.html
@@ -16,7 +16,7 @@
 		}
 		$('.updatedText-JS-' + sID_%.object_id%).text(beautyText_%.object_id%);
 	});
-	
+
 var openable%.object_id%Level=parseInt('%.level%');
 var openable%.object_id%Timer=0;
 function sendNewLevel%.object_id%() {