tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-09-22 09:17:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Unify how to take macros parameter

Browse Source
This commit is contained in:
Mattia Codato 2020-06-30 13:51:42 +02:00 committed by Noah Hilverling
parent 00a4d2c2eb
commit 20dab6669b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/icinga/apiactions.cpp
View File

@ -542,8 +542,9 @@ Dictionary::Ptr ApiActions::ExecuteCommand(const ConfigObject::Ptr& object,
MacroProcessor::ResolverList resolvers; MacroProcessor::ResolverList resolvers;
if (params->Contains("macros")) { if (params->Contains("macros")) {
if (params->Get("macros").IsObjectType<Dictionary>()) Value macros = HttpUtility::GetLastParameter(params, "macros");
resolvers.emplace_back("override",HttpUtility::GetLastParameter(params, "macros")); if (macros.IsObjectType<Dictionary>())
resolvers.emplace_back("override", macros);
else else
return ApiActions::CreateResult(400, "Parameter macros must be a dictionary."); return ApiActions::CreateResult(400, "Parameter macros must be a dictionary.");
} }