summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--provisioning-controller.lua2
-rw-r--r--provisioning-model.lua9
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