From 1a6f27f2f632f96194dc0af16f1ee728c0ff2cc8 Mon Sep 17 00:00:00 2001
From: Nathan Schneider <n@nathanschneider.info>
Date: Wed, 29 Dec 2021 22:25:28 -0700
Subject: [PATCH] More bugfixes on displays and interactions, mainly fixing
damage done two commits ago
---
modpol_core/modules/display_processes.lua | 13 +++++++++++--
modpol_minetest/overrides/interactions.lua | 1 +
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/modpol_core/modules/display_processes.lua b/modpol_core/modules/display_processes.lua
index b1b704f..5e4fff2 100644
--- a/modpol_core/modules/display_processes.lua
+++ b/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
diff --git a/modpol_minetest/overrides/interactions.lua b/modpol_minetest/overrides/interactions.lua
index 45fb7e0..e39ac6a 100644
--- a/modpol_minetest/overrides/interactions.lua
+++ b/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