From 248d510e1001a9b31efc4e9d2f60fea107666fc0 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Tue, 12 Jan 2016 14:37:23 +0000 Subject: Modify roles to use cfe type structure rather than table for consistency --- app/acf-util/roles-controller.lua | 2 +- app/acf-util/roles-model.lua | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/acf-util/roles-controller.lua b/app/acf-util/roles-controller.lua index 0c9ba85..4363ab8 100644 --- a/app/acf-util/roles-controller.lua +++ b/app/acf-util/roles-controller.lua @@ -7,7 +7,7 @@ mymodule.default_action = "read" mymodule.read = function(self) userid = cfe({ value=self.sessiondata.userinfo.userid, label="User Id" }) roles = cfe({ type="list", value=self.sessiondata.userinfo.roles, label="Roles" }) - permissions = cfe({ type="table", value = self.sessiondata.permissions, label="Permissions" }) + permissions = cfe({ type="structure", value = self.sessiondata.permissions, label="Permissions" }) return cfe({ type="group", value={userid=userid, roles=roles, permissions=permissions}, label="Roles/Permission list for "..self.sessiondata.userinfo.userid }) end diff --git a/app/acf-util/roles-model.lua b/app/acf-util/roles-model.lua index 943e786..8b51503 100644 --- a/app/acf-util/roles-model.lua +++ b/app/acf-util/roles-model.lua @@ -9,18 +9,18 @@ roles = require("roles") mymodule.get_user_roles = function(self, userid) local userinfo = authenticator.get_userinfo(self, userid) or {} rls = cfe({ type="list", value=userinfo.roles or {}, label="Roles" }) - permissions = cfe({ type="table", value=roles.get_roles_perm(self, rls.value), label="Permissions" }) + permissions = cfe({ type="structure", value=roles.get_roles_perm(self, rls.value), label="Permissions" }) return cfe({ type="group", value={roles=rls, permissions=permissions}, label="Roles/Permission list for "..userid }) end -- Return permissions for specified role mymodule.get_role_perms = function(self, role) - return cfe({ type="table", value=roles.get_role_perm(self, role), label="Permissions" }) + return cfe({ type="structure", value=roles.get_role_perm(self, role), label="Permissions" }) end -- Return list of all permissions mymodule.get_perms_list = function(self) - return cfe({ type="table", value=roles.get_all_permissions(self), label="All Permissions" }) + return cfe({ type="structure", value=roles.get_all_permissions(self), label="All Permissions" }) end mymodule.view_roles = function(self) @@ -65,7 +65,7 @@ mymodule.getpermissions = function(self, clientdata) local permissions_cfe = cfe({ type="multi", value=my_perms, option=all_perms, label="Role permissions", seq=2 }) - return cfe({ type="table", value={role=role_cfe, permissions=permissions_cfe} }) + return cfe({ type="structure", value={role=role_cfe, permissions=permissions_cfe} }) end mymodule.setnewpermissions = function(self, permissions, action) -- cgit v1.2.3