From 6fd5954565c32287390b51b1995b8f781e75d2c2 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Tue, 4 Dec 2012 22:06:07 +0000 Subject: Changed cfe from iface to name to match what it used to be The ifup, ifdown, and delete actions should have taken the interface name as 'name', not 'iface', this was changed mistakenly. --- interfaces-model.lua | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'interfaces-model.lua') diff --git a/interfaces-model.lua b/interfaces-model.lua index dbb3365..9afca19 100644 --- a/interfaces-model.lua +++ b/interfaces-model.lua @@ -395,15 +395,15 @@ end get_delete_iface_by_name = function(self, clientdata) local result = {} - result.iface = cfe({ value=clientdata.name or "", label="Interface Name" }) + result.name = cfe({ value=clientdata.name or "", label="Interface Name" }) return cfe({ type="group", value=result, label="Interface Name" }) end delete_iface_by_name = function(self, deleterequest) - if deleterequest.value.iface.value and deleterequest.value.iface.value ~= "" then - local res, err = iface.delete(deleterequest.value.iface.value) + if deleterequest.value.name.value and deleterequest.value.name.value ~= "" then + local res, err = iface.delete(deleterequest.value.name.value) end if res then @@ -489,15 +489,15 @@ end get_ifup_by_name = function(self, clientdata) local result = {} - result.iface = cfe({ type="select", value=clientdata.name or "", label="Interface Name", option=iface.list_interfaces() }) + result.name = cfe({ type="select", value=clientdata.name or "", label="Interface Name", option=iface.list_interfaces() }) return cfe({ type="group", value=result, label="Interface Name" }) end ifup_by_name = function (self, ifuprequest) - local success = modelfunctions.validateselect(ifuprequest.value.iface) + local success = modelfunctions.validateselect(ifuprequest.value.name) if success then - name = ifuprequest.value.iface.value or "" + name = ifuprequest.value.name.value or "" local cmd = path.."ifup "..format.escapespecialcharacters(name).." 2>&1" local f = io.popen(cmd) ifuprequest.descr = f:read("*a") @@ -515,15 +515,15 @@ end get_ifdown_by_name = function(self, clientdata) local result = {} - result.iface = cfe({ type="select", value=clientdata.name or "", label="Interface Name", option=iface.list_interfaces() }) + result.name = cfe({ type="select", value=clientdata.name or "", label="Interface Name", option=iface.list_interfaces() }) return cfe({ type="group", value=result, label="Interface Name" }) end ifdown_by_name = function (self, ifdownrequest) - local success = modelfunctions.validateselect(ifdownrequest.value.iface) + local success = modelfunctions.validateselect(ifdownrequest.value.name) if success then - name = ifdownrequest.value.iface.value or "" + name = ifdownrequest.value.name.value or "" local cmd = path.."ifdown "..format.escapespecialcharacters(name).." 2>&1" local f = io.popen(cmd) ifdownrequest.descr = f:read("*a") -- cgit v1.2.3