From 846a69204d0d2e54638f8e08a3052b2316827cab Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Thu, 15 May 2008 20:15:32 +0000
Subject: 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
---
 app/acf-util/roles-controller.lua | 46 ++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 18 deletions(-)

(limited to 'app/acf-util/roles-controller.lua')

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
 
-- 
cgit v1.2.3