Modpol/modpol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing lazy deletion check

Browse Source
This commit is contained in:
Luke Miller 2021-05-09 17:43:24 -04:00
parent 23f6455a89
commit ac8bb432e0
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
modpol/orgs/requests.lua
View File

@ -58,10 +58,12 @@ end
function modpol.orgs:list_request() function modpol.orgs:list_request()
local str local str
for id, req in ipairs(self.requests) do for id, req in ipairs(self.requests) do
if str then if req ~= "deleted" then
str = str .. '\n' .. req.type .. ' (' .. req.user .. ') ' if str then
else str = str .. '\n' .. req.type .. ' (' .. req.user .. ') '
str = req.type .. ' (' .. req.user .. ') ' else
str = req.type .. ' (' .. req.user .. ') '
end
end end
end end
return str return str
@ -74,15 +76,20 @@ function modpol.orgs:resolve_request(request_id, approve)
local request = self.requests[request_id] local request = self.requests[request_id]
local p = request.params local p = request.params
if request.type == "add_org" then -- there's probably a way to clean this up, the issue is the varying number of commands
self:add_org(p[1]) -- ex: self['add_member'](self, 'member_name')
elseif request.type == "delete" then -- not sure if this is safe, more testing to do
self:delete() self[request.type](self, p[1], p[2], p[3])
elseif request.type == "add_member" then
self:add_member(p[1]) -- if request.type == "add_org" then
elseif request.type == "remove_member" then -- self:add_org(p[1])
self:remove_member(p[1]) -- elseif request.type == "delete" then
end -- self:delete()
-- elseif request.type == "add_member" then
-- self:add_member(p[1])
-- elseif request.type == "remove_member" then
-- self:remove_member(p[1])
-- end
end end
@ -124,7 +131,7 @@ function modpol.orgs:make_request(request)
-- tries to use org's policy table, defers to parent otherwise -- tries to use org's policy table, defers to parent otherwise
if not requested_policy then if not requested_policy then
modpol.ocutil.log(request.type .. 'policy not found, deferring to parent org') modpol.ocutil.log(request.type .. ' policy not found, deferring to parent org')
requested_policy = parent_policy requested_policy = parent_policy
if not parent_policy then if not parent_policy then