bug fixes: orgs load properly (metatable set), orgs can't have same name, orgs now saved on modifying operations

This commit is contained in:
Luke Miller
2021-04-16 20:27:31 -04:00
parent 6bc5f4077e
commit cff1d393c0
3 changed files with 28 additions and 13 deletions

View File

@@ -1,4 +1,4 @@
modpol.orgs =
modpol.orgs = modpol.orgs or
{
count = 1,
array = {}
@@ -46,6 +46,8 @@ function modpol.orgs.reset()
modpol.orgs.array[id] = nil
end
end
modpol.orgs:record('Resetting all orgs', 'org_reset')
end
-- ===================================================
@@ -74,6 +76,9 @@ function modpol.orgs.init_instance()
-- adding instance to org list
modpol.orgs.array[1] = instance
modpol.orgs:record('Initialized the instance org', 'create_instance')
return instance
end
@@ -129,6 +134,12 @@ function modpol.orgs:add_org(name)
return false, error_msg
end
if modpol.orgs.get_org(name) then
error_msg = 'Error: org name is already being used'
modpol.ocutil.log(error_msg)
return false, error_msg
end
-- creating the child sub org
modpol.orgs.count = modpol.orgs.count + 1
local child_org = {
@@ -147,6 +158,7 @@ function modpol.orgs:add_org(name)
-- adding child to org list
modpol.orgs.array[child_org.id] = child_org
self:record('created sub org ' .. name, 'add_org')
return child_org
end
@@ -171,6 +183,8 @@ function modpol.orgs:delete()
modpol.orgs.array[self.id] = 'removed'
print('Removed ' .. self.name .. ': ' .. self.id)
self:record('Deleted ' .. self.name .. ' and all child orgs', 'del_org')
end
@@ -195,6 +209,7 @@ function modpol.orgs:add_member(user)
-- adds to end if no empty spots
table.insert(self.members, user)
end
self.record('Added member ' .. user, 'add_member')
end
-- =======================================
@@ -206,6 +221,7 @@ function modpol.orgs:remove_member(user)
if user_index then
self.members[user_index] = ''
end
self.record('Removed member ' .. user, 'del_member')
end
-- ===========================================