Skip to content
Snippets Groups Projects
Commit 4842f319 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

ci webgui - detect missing placeholder in templates

parent 0400057a
No related branches found
No related tags found
No related merge requests found
......@@ -255,6 +255,7 @@
"foreman-error-missing-template": "In Foreman wurde das Templatefile [%s] definiert, aber dieses existiert nicht im Build.",
"foreman-error-no-replacement-for-id": "In Foreman wurde keine noch Ersetzung für [%s] definiert.",
"foreman-error-no-target": "In Foreman wurde keine Ziel-Datei definiert",
"foreman-error-no-replacement-in-templatefile": "Es wurde kein Platzhalter zum Ersetzen in diesem Template gefunden.",
"foreman-error-template-unknown": "Das Template wurde in Foreman nicht aufgenommen",
"foreman-error-replacement-unknown": "Das Replacement [%s] in Foreman existiert im Template nicht.",
"foreman-hostgroup": "Foreman Hostgruppe",
......
......@@ -257,6 +257,7 @@
"foreman-error-missing-template": "In Foreman the templatefile [%s] was defined but it does not exist in the build.",
"foreman-error-no-replacement-for-id": "There is no replacement for [%s] in Foreman.",
"foreman-error-no-target": "No target file was set in Foreman",
"foreman-error-no-replacement-in-templatefile": "No placeholder for a replacement was found in this template.",
"foreman-error-template-unknown": "The template was not added in Foreman.",
"foreman-error-replacement-unknown": "The replacement [%s] from Foreman has no plceholder in the template file.",
"foreman-hostgroup": "Foreman hostgroup",
......
......@@ -119,22 +119,30 @@ if ($sPhase) {
// --- loop over all replacement items of template file
// and check if they exist in foreman
foreach ($aFields as $sField){
if ($aReplacementsForeman && array_key_exists($sField, $aReplacementsForeman[$tTplFile]['replace'])){
$sTd=$aReplacementsForeman[$tTplFile]['replace'][$sField];
} else {
if ($bFileInForeman){
$sTd=$oHtml->getBox('error', sprintf(t('foreman-error-no-replacement-for-id'), $sField));
$aWarnings[]=$tTplFile.': '.sprintf(t('foreman-error-no-replacement-for-id'), $sField);
if (count($aFields)) {
foreach ($aFields as $sField){
if ($aReplacementsForeman && array_key_exists($sField, $aReplacementsForeman[$tTplFile]['replace'])){
$sTd=$aReplacementsForeman[$tTplFile]['replace'][$sField];
} else {
$sTd='-';
}
if ($bFileInForeman){
$sTd=$oHtml->getBox('error', sprintf(t('foreman-error-no-replacement-for-id'), $sField));
$aWarnings[]=$tTplFile.': '.sprintf(t('foreman-error-no-replacement-for-id'), $sField);
} else {
$sTd='-';
}
}
$aTable['body'][]=array(
$oHtml->getIcon('replace') . $sField,
$sTd
);
}
} else {
$aTable['body'][]=array(
$oHtml->getIcon('replace') . $sField,
$sTd
$oHtml->getBox('error', t('foreman-error-no-replacement-in-templatefile')),
'-'
);
$aWarnings[]=$tTplFile.': '.t('foreman-error-no-replacement-in-templatefile');
}
// --- reverse check ... loop over all replacement items of foreman
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment