diff options
author | Ted Trask <ttrask01@yahoo.com> | 2016-01-02 21:47:59 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2016-01-02 21:47:59 +0000 |
commit | 4b73ef0dd480502dee2fff044667c04692b7d3a3 (patch) | |
tree | 38d52e647c877134b055594d5a9646b592cc9ce3 | |
parent | 2f19efb668330ae932333cdb78bfc18dbb11fe5b (diff) | |
download | acf-provisioning-4b73ef0dd480502dee2fff044667c04692b7d3a3.tar.bz2 acf-provisioning-4b73ef0dd480502dee2fff044667c04692b7d3a3.tar.xz |
Allow parameter failure when creating device (or could never create devices)
-rw-r--r-- | provisioning-controller.lua | 2 | ||||
-rw-r--r-- | provisioning-model.lua | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/provisioning-controller.lua b/provisioning-controller.lua index 32c2da2..96ab26f 100644 --- a/provisioning-controller.lua +++ b/provisioning-controller.lua @@ -95,7 +95,7 @@ mymodule.editdevice = function( self ) end mymodule.createdevice = function( self ) - return self.handle_form(self, self.model.get_new_device, self.model.create_device, self.clientdata, "Create", "Create Device", "Device Created") + return self.handle_form(self, self.model.get_new_device, self.model.create_device, self.clientdata, "Create", "Create Device") end mymodule.duplicatedevice = function( self ) diff --git a/provisioning-model.lua b/provisioning-model.lua index fd4c1e4..34f8572 100644 --- a/provisioning-model.lua +++ b/provisioning-model.lua @@ -1658,11 +1658,17 @@ mymodule.update_device = function(self, device, action, create) end end + device.descr = "Device Created" + -- Notify the device that its params might have changed (this will also validate) local s = saved_device_params[device.value.device_id.value] local r = set_device_params(get_device_params(device.value.device_id.value, false), false) if r.errtxt then - error(r:print_errtxt()) + if create then + device.descr = device.descr.."\nERROR: Failed to update params\n"..r:print_errtxt() + else + error(r:print_errtxt()) + end end callscript(updatedevicescriptfile, device, saved_devices[device.value.device_id.value], r, s) @@ -1678,6 +1684,7 @@ mymodule.update_device = function(self, device, action, create) end end if not success then + device.descr = nil if create then device.errtxt = errtxt or "Failed to create device" else |