Skip to content

Commit ea53a29

Browse files
# Release 2.2.1 (#4)
# Release 2.2.1 ## Bugfix - Error with adding new DNS server (introduced in version 2.2.0)
1 parent 0678b06 commit ea53a29

4 files changed

Lines changed: 30 additions & 16 deletions

File tree

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# Changelog
22
All notable changes to this project will be documented in this file.
33

4+
## Release 2.2.1
5+
6+
### Bugfix
7+
- Error with adding new DNS server (introduced in version 2.2.0)
8+
49
## Release 2.2.0
510

611
### New features

CSK_Module_DeviceNetworkConfig/project.mf.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ See following descriptions of events/functions regarding further information.
227227
</serves>
228228
</crown>
229229
<meta key="author">SICK AG</meta>
230-
<meta key="version">2.2.0</meta>
230+
<meta key="version">2.2.1</meta>
231231
<meta key="priority">low</meta>
232232
<meta key="copy-protected">false</meta>
233233
<meta key="read-protected">false</meta>

CSK_Module_DeviceNetworkConfig/scripts/Configuration/DeviceNetworkConfig/DeviceNetworkConfig_Controller.lua

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,6 @@ local function getNameserverList()
190190
end
191191
end
192192

193-
if #retValue == 0 then
194-
table.insert(retValue, {dns= '-'})
195-
end
196-
197193
return retValue
198194
end
199195

@@ -258,7 +254,11 @@ local function updateNameservers(nameserverList)
258254
CSK_DeviceNetworkConfig.sendParameters()
259255

260256
-- Update DNS UI table
261-
Script.notifyEvent("DeviceNetworkConfig_OnNewDNS", deviceNetworkConfig_Model.helperFuncs.json.encode(getNameserverList()))
257+
local dnsList = deviceNetworkConfig_Model.helperFuncs.json.encode(getNameserverList())
258+
if dnsList == '[]' or dnsList == '' then
259+
dnsList = '[{"dns":"-"}]'
260+
end
261+
Script.notifyEvent("DeviceNetworkConfig_OnNewDNS", dnsList)
262262
end
263263

264264
local function addDNS()
@@ -318,7 +318,11 @@ local function selectDNSViaUI(selectedRow)
318318

319319
-- Workaround to reset the selection of the DNS in the UI table
320320
Script.sleep(100)
321-
Script.notifyEvent("DeviceNetworkConfig_OnNewDNS", deviceNetworkConfig_Model.helperFuncs.json.encode(getNameserverList()))
321+
local dnsList = deviceNetworkConfig_Model.helperFuncs.json.encode(getNameserverList())
322+
if dnsList == '[]' or dnsList == '' then
323+
dnsList = '[{"dns":"-"}]'
324+
end
325+
Script.notifyEvent("DeviceNetworkConfig_OnNewDNS", dnsList)
322326
end
323327
Script.serveFunction('CSK_DeviceNetworkConfig.selectDNSViaUI', selectDNSViaUI)
324328

@@ -346,7 +350,12 @@ local function handleOnExpiredTmrDeviceNetworkConfig()
346350
Script.notifyEvent("DeviceNetworkConfig_OnNewDefaultGateway", '-')
347351
Script.notifyEvent("DeviceNetworkConfig_OnNewInterfaceChoice",'-')
348352
Script.notifyEvent("DeviceNetworkConfig_OnNewEthernetConfigStatus", 'empty')
349-
Script.notifyEvent("DeviceNetworkConfig_OnNewDNS", deviceNetworkConfig_Model.helperFuncs.json.encode(getNameserverList()))
353+
354+
local dnsList = deviceNetworkConfig_Model.helperFuncs.json.encode(getNameserverList())
355+
if dnsList == '[]' or dnsList == '' then
356+
dnsList = '[{"dns":"-"}]'
357+
end
358+
Script.notifyEvent("DeviceNetworkConfig_OnNewDNS", dnsList)
350359

351360
Script.notifyEvent("DeviceNetworkConfig_OnNewStatusLoadParameterOnReboot", deviceNetworkConfig_Model.parameterLoadOnReboot)
352361
Script.notifyEvent("DeviceNetworkConfig_OnPersistentDataModuleAvailable", deviceNetworkConfig_Model.persistentModuleAvailable)

docu/CSK_Module_DeviceNetworkConfig.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<meta name="generator" content="Asciidoctor 2.0.12">
88
<meta name="author" content="SICK AG">
9-
<title>Documentation - CSK_Module_DeviceNetworkConfig 2.2.0</title>
9+
<title>Documentation - CSK_Module_DeviceNetworkConfig 2.2.1</title>
1010
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
1111
<style>
1212
/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
@@ -615,11 +615,11 @@
615615
</head>
616616
<body class="article toc2 toc-left">
617617
<div id="header">
618-
<h1>Documentation - CSK_Module_DeviceNetworkConfig 2.2.0</h1>
618+
<h1>Documentation - CSK_Module_DeviceNetworkConfig 2.2.1</h1>
619619
<div class="details">
620620
<span id="author" class="author">SICK AG</span><br>
621-
<span id="revnumber">version 2.2.0,</span>
622-
<span id="revdate">2024-07-31</span>
621+
<span id="revnumber">version 2.2.1,</span>
622+
<span id="revdate">2024-12-05</span>
623623
</div>
624624
<div id="toc" class="toc2">
625625
<div id="toctitle">Table of Contents</div>
@@ -720,11 +720,11 @@ <h2 id="_document_metadata">Document metadata</h2>
720720
</tr>
721721
<tr>
722722
<th class="tableblock halign-left valign-top"><p class="tableblock">Version</p></th>
723-
<td class="tableblock halign-left valign-top"><p class="tableblock">2.2.0</p></td>
723+
<td class="tableblock halign-left valign-top"><p class="tableblock">2.2.1</p></td>
724724
</tr>
725725
<tr>
726726
<th class="tableblock halign-left valign-top"><p class="tableblock">Date</p></th>
727-
<td class="tableblock halign-left valign-top"><p class="tableblock">2024-07-31</p></td>
727+
<td class="tableblock halign-left valign-top"><p class="tableblock">2024-12-05</p></td>
728728
</tr>
729729
<tr>
730730
<th class="tableblock halign-left valign-top"><p class="tableblock">Author</p></th>
@@ -3221,8 +3221,8 @@ <h4 id="_overview_2">Overview</h4>
32213221
</div>
32223222
<div id="footer">
32233223
<div id="footer-text">
3224-
Version 2.2.0<br>
3225-
Last updated 2024-07-31 16:12:12 +0200
3224+
Version 2.2.1<br>
3225+
Last updated 2024-12-05 10:55:48 +0100
32263226
</div>
32273227
</div>
32283228
<script type="text/javascript">

0 commit comments

Comments
 (0)