|
@@ -7,7 +7,7 @@
|
|
-- @param intiator Initiator for module
|
|
-- @param intiator Initiator for module
|
|
-- @param config Config for module
|
|
-- @param config Config for module
|
|
-- @param result
|
|
-- @param result
|
|
-function modpol.orgs:call_module(module_slug, initiator, config, result, parent_id)
|
|
|
|
|
|
+function modpol.orgs:call_module(module_slug, initiator, config, result, parent_id)
|
|
if not modpol.modules[module_slug] then
|
|
if not modpol.modules[module_slug] then
|
|
modpol.ocutil.log('Error in ' .. self.name .. ':call_module -> module "' .. module_slug .. '" not found')
|
|
modpol.ocutil.log('Error in ' .. self.name .. ':call_module -> module "' .. module_slug .. '" not found')
|
|
return
|
|
return
|
|
@@ -15,21 +15,15 @@ function modpol.orgs:call_module(module_slug, initiator, config, result, parent_
|
|
|
|
|
|
local index = #self.processes + 1
|
|
local index = #self.processes + 1
|
|
|
|
|
|
- local module = modpol.modules[module_slug]
|
|
|
|
|
|
+ local module = self.modules[module_slug]
|
|
|
|
|
|
- -- sets default values for undeclared config variables
|
|
|
|
-- first applies any relevant org policies
|
|
-- first applies any relevant org policies
|
|
-- then overrides with the config values given on input
|
|
-- then overrides with the config values given on input
|
|
local new_config = {}
|
|
local new_config = {}
|
|
if modpol.util.num_pairs(module.config) > 0 then
|
|
if modpol.util.num_pairs(module.config) > 0 then
|
|
for k, v in pairs(module.config) do
|
|
for k, v in pairs(module.config) do
|
|
new_config[k] = v
|
|
new_config[k] = v
|
|
- -- org policies
|
|
|
|
- if self.policies[module_slug]
|
|
|
|
- and self.policies[module_slug][k] then
|
|
|
|
- new_config[k] = self.policies[module_slug][k]
|
|
|
|
- end
|
|
|
|
- -- input settings
|
|
|
|
|
|
+ -- overrides with input settings
|
|
if config and config[k] then
|
|
if config and config[k] then
|
|
new_config[k] = config[k]
|
|
new_config[k] = config[k]
|
|
end
|
|
end
|