From 05e87b21529bbec383ab513e2899048aded15120 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Mon, 26 Aug 2013 20:14:20 +0000 Subject: Fix redirection when creating new devices --- provisioning-controller.lua | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'provisioning-controller.lua') diff --git a/provisioning-controller.lua b/provisioning-controller.lua index 7dce123..3171904 100644 --- a/provisioning-controller.lua +++ b/provisioning-controller.lua @@ -95,12 +95,7 @@ editdevice = function( self ) end createdevice = function( self ) - local retval = self.handle_form(self, self.model.get_new_device, self.model.create_device, self.clientdata, "Create", "Create Device", "Device Created") - if retval.value.device_id.value ~= "" and not retval.errtxt and self.redirect then - -- Successfully created a device, redirect to edit it - self:redirect("editdevice?device_id="..retval.value.device_id.value.."&redir=".. (self.clientdata.redir or "listdevices")) - end - return retval + return self.handle_form(self, self.model.get_new_device, self.model.create_device, self.clientdata, "Create", "Create Device", "Device Created") end duplicatedevice = function( self ) @@ -160,10 +155,5 @@ deleterequest = function( self ) end createdevicefromrequest = function( self ) - local retval = self.handle_form(self, self.model.get_request, self.model.create_from_request, self.clientdata, "Create", "Create Device", "Device Created") - if retval.value.device_id and retval.value.device_id.value ~= "" and not retval.errtxt and self.redirect then - -- Successfully created a device, redirect to edit it - self:redirect("editdevice?device_id="..retval.value.device_id.value.."&redir=".. (self.clientdata.redir or "listdevices")) - end - return retval + return self.handle_form(self, self.model.get_request, self.model.create_from_request, self.clientdata, "Create", "Create Device", "Device Created") end -- cgit v1.2.3