From 9101f6708c1fd9e0decf4b6d8e1504924ddb40f0 Mon Sep 17 00:00:00 2001 From: Stefan Kremser Date: Tue, 27 Mar 2018 10:26:45 +0200 Subject: [PATCH] WEB: Save name on select But only save when changed --- web_interface/js/scan.js | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/web_interface/js/scan.js b/web_interface/js/scan.js index 4f94ea1..a6636b5 100644 --- a/web_interface/js/scan.js +++ b/web_interface/js/scan.js @@ -162,6 +162,7 @@ function selectRow(type,id,selected){ getFile("run?cmd="+(selected ? "":"de")+"select station "+id); break; case 2: + save(id); nameJson[id][5] = selected; drawNames(); getFile("run?cmd="+(selected ? "":"de")+"select name "+id); @@ -188,19 +189,26 @@ function remove(type,id){ } function save(id){ - nameJson[id][0] = getE("name_"+id+"_mac").innerHTML.replace("
",""); - nameJson[id][2] = getE("name_"+id+"_name").innerHTML.replace("
",""); - nameJson[id][3] = getE("name_"+id+"_apbssid").innerHTML.replace("
",""); - nameJson[id][4] = getE("name_"+id+"_ch").innerHTML.replace("
",""); - - if(nameJson[id][0].length != 17){ - showMessage("ERROR: MAC invalid"); - return; + var mac = getE("name_"+id+"_mac").innerHTML.replace("
",""); + var name = getE("name_"+id+"_name").innerHTML.replace("
",""); + var apbssid = getE("name_"+id+"_apbssid").innerHTML.replace("
",""); + var ch = getE("name_"+id+"_ch").innerHTML.replace("
",""); + var changed = mac != nameJson[id][0] || name != nameJson[id][2] || apbssid != nameJson[id][3] || ch != nameJson[id][4]; + if(changed){ + nameJson[id][0] = mac; + nameJson[id][2] = name; + nameJson[id][3] = apbssid; + nameJson[id][4] = ch; + + if(nameJson[id][0].length != 17){ + showMessage("ERROR: MAC invalid"); + return; + } + + getFile("run?cmd=replace name "+id+" -n \""+nameJson[id][2]+"\" -m \""+nameJson[id][0]+"\" -ch "+nameJson[id][4]+" -b \""+nameJson[id][3]+"\" "+(nameJson[id][5] ? "-s" : "")); + + drawNames(); } - - getFile("run?cmd=replace name "+id+" -n \""+nameJson[id][2]+"\" -m \""+nameJson[id][0]+"\" -ch "+nameJson[id][4]+" -b \""+nameJson[id][3]+"\" "+(nameJson[id][5] ? "-s" : "")); - - drawNames(); } function add(type,id){