diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2013-08-26 20:14:20 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2013-08-26 22:08:23 +0000 |
| commit | 154342dcb74db921bbf44e36f091c01f20ce96af (patch) | |
| tree | 938efd4656ef36227a396a4104297e6236d0eb3b /provisioning-controller.lua | |
| parent | 9703112837f037a1b2b234bac20f923a889f1854 (diff) | |
| download | acf-provisioning-154342dcb74db921bbf44e36f091c01f20ce96af.tar.bz2 acf-provisioning-154342dcb74db921bbf44e36f091c01f20ce96af.tar.xz | |
Fix redirection when creating new devices
(cherry picked from commit 05e87b21529bbec383ab513e2899048aded15120)
Conflicts:
provisioning-controller.lua
provisioning-editdevice-html.lsp
provisioning-editdeviceparams-html.lsp
Diffstat (limited to 'provisioning-controller.lua')
| -rw-r--r-- | provisioning-controller.lua | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/provisioning-controller.lua b/provisioning-controller.lua index faa46ee..dab50d3 100644 --- a/provisioning-controller.lua +++ b/provisioning-controller.lua @@ -97,12 +97,7 @@ editdevice = function( self ) end createdevice = function( self ) - local retval = controllerfunctions.handle_form(self, self.model.get_device, self.model.create_device, self.clientdata, "Create", "Create Device", "Device Created") - if retval.value.device_id.value ~= "" and not retval.errtxt 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 controllerfunctions.handle_form(self, self.model.get_device, self.model.create_device, self.clientdata, "Create", "Create Device", "Device Created") end duplicatedevice = function( self ) @@ -162,10 +157,5 @@ deleterequest = function( self ) end createdevicefromrequest = function( self ) - local retval = controllerfunctions.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 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 controllerfunctions.handle_form(self, self.model.get_request, self.model.create_from_request, self.clientdata, "Create", "Create Device", "Device Created") end |