Updates

* UI tweaks * Fix for incorrect processing for devices with friendly names set in Zigbee2Mqtt
directman66 · Aug 13, 2021 · 51c5a45 · 51c5a45
1 parent 6efa169
commit 51c5a45
Show file tree

Hide file tree

Showing 9 changed files with 2,477 additions and 2,593 deletions.
diff --git a/modules/zigbee2mqtt/mqtt_edit.inc.php b/modules/zigbee2mqtt/mqtt_edit.inc.php
@@ -16,6 +16,12 @@
 debmes($sql,'zigbee2mqtt');
   $rec=SQLSelectOne($sql);
 
+  if ($rec['DEV_ID']) {
+      $device=SQLSelectOne("SELECT ID, TITLE FROM zigbee2mqtt_devices WHERE ID=".$rec['DEV_ID']);
+      $out['DEVICE_TITLE']=$device['TITLE'];
+      $out['DEVICE_ID']=$device['ID'];
+  }
+
 
 
   if ($this->mode=='creategroup') {

diff --git a/modules/zigbee2mqtt/mqtt_search.inc.php b/modules/zigbee2mqtt/mqtt_search.inc.php
@@ -179,7 +179,7 @@
 //if (($req_type==' ')&&($req_vendor==' '))    $req_vid=' and SELECTVENDOR <>"group" '; 
 
 //  $res=SQLSelect('select zigbee2mqtt_devices.ID DEVID, zigbee2mqtt_devices.*,LOCATION from zigbee2mqtt_devices  left join (select ID LOCID, TITLE LOCATION from locations) locations ON  zigbee2mqtt_devices.LOCATION_ID=locations.LOCID  where  TITLE<>"bridge"  '.$req_location.' '. $req_type. ' order by  FIND  DESC' );
-$sql='select zigbee2mqtt_devices.ID DEVID, zigbee2mqtt_devices.TYPE , zigbee2mqtt_devices.*,LOCATION from zigbee2mqtt_devices  left join (select ID LOCID, TITLE LOCATION from locations) locations ON  zigbee2mqtt_devices.LOCATION_ID=locations.LOCID  where  TITLE<>"bridge" and selecttype<>"cc2531" '.$req_location.' '. $req_type.' '.$req_vendor. ' '.$req_vid. ' '.$req_group. ' order by  DATE(FIND) DESC, SELECTVENDOR ';
+$sql='select zigbee2mqtt_devices.ID DEVID, zigbee2mqtt_devices.TYPE , zigbee2mqtt_devices.*,LOCATION from zigbee2mqtt_devices  left join (select ID LOCID, TITLE LOCATION from locations) locations ON  zigbee2mqtt_devices.LOCATION_ID=locations.LOCID  where  TITLE<>"bridge" and selecttype<>"cc2531" '.$req_location.' '. $req_type.' '.$req_vendor. ' '.$req_vid. ' '.$req_group. ' order by DATE(FIND) DESC, SELECTVENDOR ';
 //debmes($sql, 'zigbee2mqtt');
   $res=SQLSelect( $sql);