Skip to content

Fixed issue with hiding conditions not hiding containers in simple ticket view #942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −2
Open

Fixed issue with hiding conditions not hiding containers in simple ticket view #942

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
7 changes: 7 additions & 0 deletions ajax/container.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,19 @@

$display_condition = new PluginFieldsContainerDisplayCondition();
if ($display_condition->computeDisplayContainer($item, $containers_id)) {
$field_options = [
'label_class' => 'col-lg-3',
'input_class' => 'col-lg-9',
];
echo "<div class='offset-md-1 col-md-8 col-xxl-6'>";
PluginFieldsField::showDomContainer(
$containers_id,
$item,
$type,
$subtype,
$field_options,
);
echo "</div>";
} else {
echo '';
}
Expand Down
10 changes: 8 additions & 2 deletions inc/field.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,6 +887,12 @@ public static function showForTab($params)
{
$item = $params['item'];

if ($item->fields['type'] == "") {
$item->fields['type'] = $params['options']['type'];
}
if ($item->fields['itilcategories_id'] == "") {
$item->fields['itilcategories_id'] = $params['options']['itilcategories_id'];
}
$functions = array_column(debug_backtrace(), 'function');
$subtype = isset($_SESSION['glpi_tabs'][strtolower($item::getType())]) ? $_SESSION['glpi_tabs'][strtolower($item::getType())] : '';
$type = substr($subtype, -strlen('$main')) === '$main'
Expand Down Expand Up @@ -956,7 +962,7 @@ public static function showForTab($params)
}

$html_id = 'plugin_fields_container_' . mt_rand();
if (strpos($current_url, 'helpdesk.public.php') !== false) {
if (strpos($current_url, 'helpdesk.public.php') !== false || strpos($current_url, 'tracking.injector.php') !== false) {
echo "<div id='{$html_id}' class='card-body row mx-0' style='border-top:0'>";
echo "<div class='offset-md-1 col-md-8 col-xxl-6'>";
$field_options = [
Expand All @@ -976,7 +982,7 @@ public static function showForTab($params)
$field_options ?? [],
);
}
if (strpos($current_url, 'helpdesk.public.php') !== false) {
if (strpos($current_url, 'helpdesk.public.php') !== false || strpos($current_url, 'tracking.injector.php') !== false) {
echo '</div>';
}
echo '</div>';
Expand Down
Loading