Browse Source

More bugfixes on displays and interactions, mainly fixing damage done two commits ago

Nathan Schneider 2 years ago
parent
commit
1a6f27f2f6

+ 11 - 2
modpol_core/modules/display_processes.lua

@@ -29,11 +29,20 @@ function display_processes:initiate(result)
          input = "Org: "..v.org.name..
             ", initiator: "..v.initiator
          table.insert(display_table, input)
-         if v.config 
+         if v.config
             and modpol.util.num_pairs(v.config) > 0 then
             table.insert(display_table, "Policies:")
             for k2,v2 in pairs(v.config) do
-               input = k2..": "..v2
+               local v2_string = ""
+               if type(v2) ~= "string"
+                  and type(v2) ~= "table" then
+                  v2_string = tostring(v2)
+               elseif type(v2) == "table" then
+                  v2_string = table.concat(v2)
+               else
+                  v2_string = "Could not render"
+               end
+               input = k2..": "..v2_string
                table.insert(display_table, input)
             end
          end

+ 1 - 0
modpol_minetest/overrides/interactions.lua

@@ -50,6 +50,7 @@ function modpol.interactions.dashboard(user)
    local all_users = modpol.instance:list_members()
    -- pending list
    local user_pending_count = 0
+   local user_pending = {}
    for k,v in ipairs(modpol.orgs.array) do
       if v.pending and v.pending[user] then
          if modpol.util.num_pairs(v.pending[user]) ~= 0 then