Skip to content
This repository has been archived by the owner on Dec 13, 2022. It is now read-only.

fix(conf) fix parent template display in service template listing (#11671) #11676

Merged
merged 1 commit into from
Sep 5, 2022
Merged

fix(conf) fix parent template display in service template listing (#11671) #11676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion www/include/configuration/configObject/service_template_model/listServiceTemplateModel.ihtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<td class="ListColLeft resizeTitle"><a
href="{$elemArr[elem].RowMenu_link}">{$elemArr[elem].RowMenu_alias}</a></td>
<td class="ListColCenter">{$elemArr[elem].RowMenu_retry}</td>
<td class="ListColRight">{$elemArr[elem].RowMenu_parent}</td>
<td class="ListColLeft">{$elemArr[elem].RowMenu_parent}</td>
<td class="ListColCenter"><span
class="badge {$elemArr[elem].RowMenu_badge}">{$elemArr[elem].RowMenu_status}</span></td>
<td class="ListColRight" align="right">{if $mode_access == 'w'}{$elemArr[elem].RowMenu_options}{else}&nbsp;{/if}</td>
Expand Down
5 changes: 3 additions & 2 deletions www/include/configuration/configObject/service_template_model/listServiceTemplateModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,8 @@
foreach ($tplArr as $key => $value) {
$value = str_replace('#S#', "/", $value);
$value = str_replace('#BS#', "\\", $value);
$tplStr .= "&nbsp;->&nbsp;<a href='main.php?p=60206&o=c&service_id=" . $key . "'>" . $value . "</a>";
$tplStr .= "&nbsp;->&nbsp;<a href='main.php?p=60206&o=c&service_id=" . $key . "'>"
. htmlentities($value) . "</a>";
}
}

Expand Down Expand Up @@ -232,7 +233,7 @@
"RowMenu_select" => $selectedElements->toHtml(),
"RowMenu_desc" => htmlentities($service["service_description"]),
"RowMenu_alias" => htmlentities($service["service_alias"]),
"RowMenu_parent" => htmlentities($tplStr),
"RowMenu_parent" => $tplStr,
"RowMenu_icon" => $svc_icon,
"RowMenu_retry" => htmlentities(
"$normal_check_interval $normal_units / $retry_check_interval $retry_units"
Expand Down