merged

modpol/orgs/base.lua

@@ -11,7 +11,12 @@ function temp_org()
     return {
         id = nil,
         name = nil,
-        policies = {},
+        policies = {
+            add_org={process_type='consent', must_be_member=false},
+            delete={process_type='consent', must_be_member=false},
+            add_member={process_type='consent', must_be_member=false},
+            remove_member={process_type='consent', must_be_member=false}
+        },
         processes = {},
         requests = {},
         pending = {},

modpol/orgs/requests.lua

@@ -13,10 +13,11 @@ function modpol.orgs:create_process(process_type, request_id)
         return
     end
 
+    local empty_index = nil
     -- linear search for empty process slots (lazy deletion)
     for k, v in ipairs(self.processes) do
         if v == 'deleted' then
-            local empty_index = k
+            empty_index = k
             break
         end
     end
@@ -214,10 +215,11 @@ function modpol.orgs:make_request(request)
         return false
     end
 
+    local empty_index = nil
     -- linear search for empty process slots (lazy deletion)
     for k, v in ipairs(self.requests) do
         if v == 'deleted' then
-            local empty_index = k
+            empty_index = k
             break
         end
     end
@@ -231,6 +233,7 @@ function modpol.orgs:make_request(request)
         table.insert(self.requests, request)
         request_id = #self.requests
     end
+
     modpol.ocutil.log("Request made by " .. request.user .. " to " .. request.type .. " in " .. self.name)
     self:record("Request made by " .. request.user .. " to " .. request.type, "make_request")
 

modpol_minetest/overrides/interactions/interactions.lua

@@ -177,9 +177,9 @@ minetest.register_on_player_receive_fields(function (player, formname, fields)
          if nil then
          elseif fields.join then
             local new_request = {
-               user = player,
+               user = pname,
                type = "add_member",
-               params = {player}
+               params = {pname}
             }
             org:make_request(new_request)
             --org:add_member(pname)
@@ -195,7 +195,7 @@ minetest.register_on_player_receive_fields(function (player, formname, fields)
             modpol.interactions.text_query(pname, "Org name:")
             local new_org_name = _contexts[pname]
             local new_request = {
-               user = player,
+               user = pname,
                type = "add_org",
                params = {new_org_name}
             }