diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2008-05-15 20:15:32 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2008-05-15 20:15:32 +0000 |
| commit | 846a69204d0d2e54638f8e08a3052b2316827cab (patch) | |
| tree | f1e567623b6be1e62f91ba1cfe9383308790bcc9 /app/acf-util/roles-controller.lua | |
| parent | c1c2252c53ffcb14b98443f8ee2c6da40551f160 (diff) | |
| download | acf-core-846a69204d0d2e54638f8e08a3052b2316827cab.tar.bz2 acf-core-846a69204d0d2e54638f8e08a3052b2316827cab.tar.xz | |
For cfe.type='form', use cfe.option as the command to save the form data i.e. can be used as button name. Modified pages that use 'form' to also use 'option'.
git-svn-id: svn://svn.alpinelinux.org/acf/core/trunk@1122 ab2d0c66-481e-0410-8bed-d214d4d58bed
Diffstat (limited to 'app/acf-util/roles-controller.lua')
| -rw-r--r-- | app/acf-util/roles-controller.lua | 46 |
1 files changed, 28 insertions, 18 deletions
diff --git a/app/acf-util/roles-controller.lua b/app/acf-util/roles-controller.lua index aa3e6bd..4c27e9d 100644 --- a/app/acf-util/roles-controller.lua +++ b/app/acf-util/roles-controller.lua @@ -50,32 +50,42 @@ viewroles = function(self) end newrole = function(self) - local form = self.model.setpermissions(self, self.clientdata.role, self.clientdata.permissions, true) + local form + if self.clientdata.Save then + form = self.model.setpermissions(self, self.clientdata.role, self.clientdata.permissions, true) + if form.value.role.errtxt then + form.errtxt = "Failed to create role" + else + local cmdresult = cfe({ value="New role created", label="New role result" }) + self.sessiondata.cmdresult = cmdresult + redirect(self, "viewroles") + end + else + form = self.model.getpermissions(self) + end form.type = "form" form.label = "Edit new role" - if form.value.role.errtxt then - form.errtxt = "Failed to create role" - elseif self.clientdata.permissions then - -- If we have permissions, we tried to set - local cmdresult = cfe({ value="New role created" }) - self.sessiondata.cmdresult = cmdresult - redirect(self, "viewroles") - end + form.option = "Save" return form end editrole = function(self) - local form = self.model.setpermissions(self, self.clientdata.role, self.clientdata.permissions, false) + local form + if self.clientdata.Save then + form = self.model.setpermissions(self, self.clientdata.role, self.clientdata.permissions, false) + if form.value.role.errtxt then + form.errtxt = "Failed to save role" + else + local cmdresult = cfe({ value="Role saved", label="Edit role result" }) + self.sessiondata.cmdresult = cmdresult + redirect(self, "viewroles") + end + else + form = self.model.getpermissions(self, self.clientdata.role) + end form.type = "form" form.label = "Edit role" - if form.value.role.errtxt then - form.errtxt = "Failed to save role" - elseif self.clientdata.permissions then - -- If we have permissions, we tried to set - local cmdresult = cfe({ value="Role saved" }) - self.sessiondata.cmdresult = cmdresult - redirect(self, "viewroles") - end + form.option = "Save" return form end |