Skip to content

Commit 50a100a

Browse files
committed
- Implemented: OpenZWave, Node table, now also displays Manufacturer, Product ID and Product Type
1 parent 87284e6 commit 50a100a

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

History.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Version 3.xxxx (March xx 2016)
22
- Implemented: Nefit Easy, User Mode (as switch, On=Clock, Off=Manual)
33
- Implemented: OpenZWave, Aeotec ZWave+ USB Controller, Enable/Disable blinking mode (@Schmart, Thanks for the magic codes!)
4+
- Implemented: OpenZWave, Node table, now also displays Manufacturer, Product ID and Product Type
45
- Fixed: Database backup is now only possible for admin users
56
- Fixed: Better handling of white listed commands/urls
67
- Fixed: Double checking command rights

www/app/HardwareController.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2984,9 +2984,12 @@ define(['app'], function (app) {
29842984
"0": nodeStr,
29852985
"1": item.Name,
29862986
"2": item.Description,
2987-
"3": item.LastUpdate,
2988-
"4": $.t((item.PollEnabled == "true")?"Yes":"No"),
2989-
"5": statusImg+'  '+healButton,
2987+
"3": item.Manufacturer_name,
2988+
"4": item.Product_id,
2989+
"5": item.Product_type,
2990+
"6": item.LastUpdate,
2991+
"7": $.t((item.PollEnabled == "true")?"Yes":"No"),
2992+
"8": statusImg+'  '+healButton,
29902993
} );
29912994
});
29922995
}
@@ -3021,7 +3024,7 @@ define(['app'], function (app) {
30213024
$('#updelclr #nodedelete').attr("class", "btnstyle3");
30223025
$("#updelclr #nodedelete").attr("href", "javascript:DeleteNode(" + idx + ")");
30233026
}
3024-
$("#hardwarecontent #nodeparamstable #nodename").val(data["1"]);
3027+
$("#hardwarecontent #nodeparamstable #nodename").val(data["Name"]);
30253028
$('#hardwarecontent #nodeparamstable #EnablePolling').prop('checked',(data["PollEnabled"]=="true"));
30263029
if (iNode==iOwnNodeId) {
30273030
$("#hardwarecontent #nodeparamstable #trEnablePolling").hide();

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 1225
2+
# ref 1226
33

44
CACHE:
55
# CSS

www/views/hardware.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,9 @@ <h1 data-i18n="Nodes">Nodes</h1>
179179
<th width="80" align="center" data-i18n="NodeID">NodeID</th>
180180
<th width="150" align="left" data-i18n="Name">Name</th>
181181
<th align="left" data-i18n="Description">Description</th>
182+
<th width="120" align="center" data-i18n="Manufacturer">Manufacturer</th>
183+
<th width="80" align="center" data-i18n="ID">ID</th>
184+
<th width="80" align="center" data-i18n="Type">Type</th>
182185
<th width="150" align="left" data-i18n="Last Seen">Last Seen</th>
183186
<th width="50" align="left" data-i18n="EnablePolling">Enable Polling</th>
184187
<th width="50" align="left" data-i18n="Status">Status</th>

0 commit comments

Comments
 (0)