Skip to content

Commit d066eec

Browse files
committed
Fix for Satel password in hardware setup
1 parent 3ac199c commit d066eec

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

www/app/HardwareController.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2567,7 +2567,6 @@ define(['app'], function (app) {
25672567
if (HwTypeStr.indexOf("S0 Meter") >= 0) {
25682568
dispAddress="";
25692569
}
2570-
25712570
var addId = oTable.fnAddData( {
25722571
"DT_RowId": item.idx,
25732572
"Username": item.Username,
@@ -2636,11 +2635,11 @@ define(['app'], function (app) {
26362635
$("#hardwarecontent #divremote #tcpaddress").val(data["Address"]);
26372636
}
26382637
}
2639-
else if (((data["Type"].indexOf("LAN") >= 0) && (data["Type"].indexOf("YouLess") == -1)) ||(data["Type"].indexOf("Domoticz") >= 0) ||(data["Type"].indexOf("Harmony") >= 0)) {
2638+
else if (((data["Type"].indexOf("LAN") >= 0) && (data["Type"].indexOf("YouLess") == -1) && (data["Type"].indexOf("Satel") == -1)) ||(data["Type"].indexOf("Domoticz") >= 0) ||(data["Type"].indexOf("Harmony") >= 0)) {
26402639
$("#hardwarecontent #hardwareparamsremote #tcpaddress").val(data["Address"]);
26412640
$("#hardwarecontent #hardwareparamsremote #tcpport").val(data["Port"]);
26422641
}
2643-
else if (((data["Type"].indexOf("LAN") >= 0) && (data["Type"].indexOf("YouLess") >= 0)) ||(data["Type"].indexOf("Domoticz") >= 0) ||(data["Type"].indexOf("Harmony") >= 0)) {
2642+
else if (((data["Type"].indexOf("LAN") >= 0) && (data["Type"].indexOf("YouLess") >= 0)) ||(data["Type"].indexOf("Domoticz") >= 0) ||(data["Type"].indexOf("Harmony") >= 0) ||(data["Type"].indexOf("Satel") >= 0)) {
26442643
$("#hardwarecontent #hardwareparamsremote #tcpaddress").val(data["Address"]);
26452644
$("#hardwarecontent #hardwareparamsremote #tcpport").val(data["Port"]);
26462645
$("#hardwarecontent #hardwareparamslogin #password").val(data["Password"]);

www/html5.appcache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
CACHE MANIFEST
2-
# ref 1027
2+
# ref 1028
33

44
CACHE:
55
# CSS

0 commit comments

Comments
 (0)