rodrigo/genieacs
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A couple of preset bug fixes.

Browse Source
This commit is contained in:
Zaid Abdulla committed 2013-10-18 14:04:16 +03:00
1 parent a88d2c009d
commit 3a56909b4b
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
presets.coffee
+4 -4
View File
@@ -136,7 +136,7 @@ exports.getDevicePreset = (deviceId, presets, objects, callback) ->
devicePreset.customCommands[filename] ?= {} devicePreset.customCommands[filename] ?= {}
devicePreset.customCommands[filename].preset ?= {} devicePreset.customCommands[filename].preset ?= {}
devicePreset.customCommands[filename].preset.value = c.value devicePreset.customCommands[filename].preset.value = c.value
devicePreset.customCommands[filename].preset.valueCommand = c.valueCommand devicePreset.customCommands[filename].preset.valueCommand = c.command
continue if not deviceCustomCommands[filename]? or commandName not in deviceCustomCommands[filename] continue if not deviceCustomCommands[filename]? or commandName not in deviceCustomCommands[filename]
if cmd = common.getParamValueFromPath(device, "_customCommands.#{filename}") if cmd = common.getParamValueFromPath(device, "_customCommands.#{filename}")
devicePreset.customCommands[filename].current = cmd devicePreset.customCommands[filename].current = cmd
@@ -149,7 +149,7 @@ exports.getDevicePreset = (deviceId, presets, objects, callback) ->
devicePreset.customCommands[filename] ?= {} devicePreset.customCommands[filename] ?= {}
devicePreset.customCommands[filename].preset ?= {} devicePreset.customCommands[filename].preset ?= {}
devicePreset.customCommands[filename].preset.expiry = parseInt(c.expiry) devicePreset.customCommands[filename].preset.expiry = parseInt(c.expiry)
devicePreset.customCommands[filename].preset.expiryCommand = c.expiryCommand devicePreset.customCommands[filename].preset.expiryCommand = c.command
continue if not deviceCustomCommands[filename]? or commandName not in deviceCustomCommands[filename] continue if not deviceCustomCommands[filename]? or commandName not in deviceCustomCommands[filename]
if cmd = common.getParamValueFromPath(device, "_customCommands.#{filename}") if cmd = common.getParamValueFromPath(device, "_customCommands.#{filename}")
devicePreset.customCommands[filename].current = cmd devicePreset.customCommands[filename].current = cmd
@@ -158,7 +158,7 @@ exports.getDevicePreset = (deviceId, presets, objects, callback) ->
when 'software_version' when 'software_version'
devicePreset.softwareVersion ?= {} devicePreset.softwareVersion ?= {}
devicePreset.softwareVersion.preset = c.softwareVersion devicePreset.softwareVersion.preset = c.software_version
devicePreset.softwareVersion.current = common.getParamValueFromPath(device, 'InternetGatewayDevice.DeviceInfo.SoftwareVersion') devicePreset.softwareVersion.current = common.getParamValueFromPath(device, 'InternetGatewayDevice.DeviceInfo.SoftwareVersion')
else else
@@ -209,7 +209,7 @@ exports.processDevicePreset = (deviceId, devicePreset, callback) ->
setParameterValues.push(["#{parameterPath}.#{i}.#{paramName}", presetValue, paramDetails.type]) setParameterValues.push(["#{parameterPath}.#{i}.#{paramName}", presetValue, paramDetails.type])
else else
vals = [] vals = []
for k,v of allObjects[objectName] for k,v of objectDetails.preset
vals.push([k, v]) if k[0] != '_' vals.push([k, v]) if k[0] != '_'
taskList.push({device : deviceId, name : 'addObject', objectName : parameterPath, parameterValues : vals, instanceName : objectName}) taskList.push({device : deviceId, name : 'addObject', objectName : parameterPath, parameterValues : vals, instanceName : objectName})
else if Object.keys(objectDetails.current) > 0 else if Object.keys(objectDetails.current) > 0