Skip to content
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

Jump to bottom

Add under & not under condition for Tree Dropdown into DisplayCondition #549

Merged
merged 4 commits into from
Jul 4, 2022
Merged

Add under & not under condition for Tree Dropdown into DisplayCondition #549

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b2fb9f1
Add uner & not under condition for Tree Dropdown into DisplayCondition
tsmr Jun 30, 2022
863157d
Fix phpcbf
tsmr Jun 30, 2022
f758a1a
Refactor method
cedric-anne Jul 4, 2022
648d8b3
No need to instanciate itemtype
cedric-anne Jul 4, 2022
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
81 changes: 58 additions & 23 deletions inc/containerdisplaycondition.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,13 @@ class PluginFieldsContainerDisplayCondition extends CommonDBChild
public static $itemtype = PluginFieldsContainer::class;
public static $items_id = 'plugin_fields_containers_id';

const SHOW_CONDITION_EQ = 1;
const SHOW_CONDITION_NE = 2;
const SHOW_CONDITION_LT = 3;
const SHOW_CONDITION_GT = 4;
const SHOW_CONDITION_REGEX = 5;
const SHOW_CONDITION_EQ = 1;
const SHOW_CONDITION_NE = 2;
const SHOW_CONDITION_LT = 3;
const SHOW_CONDITION_GT = 4;
const SHOW_CONDITION_REGEX = 5;
const SHOW_CONDITION_UNDER = 6;
const SHOW_CONDITION_NOT_UNDER = 7;

public static function install(Migration $migration, $version)
{
Expand Down Expand Up @@ -71,23 +73,35 @@ public static function install(Migration $migration, $version)
return true;
}

public static function getEnumCondition($is_dropdown = false): array
{
/**
* Get display condition comparison operators.
*
* @param bool $only_simple_conditions
* @param bool $with_treedropdown_conditions
*
* @return array
*/
private static function getComparisonOperators(
bool $only_simple_conditions = false,
bool $with_treedropdown_conditions = false
): array {
$conditions = [
self::SHOW_CONDITION_EQ => '=',
self::SHOW_CONDITION_NE => '≠',
];

if ($is_dropdown) {
return [
self::SHOW_CONDITION_EQ => '=',
self::SHOW_CONDITION_NE => '≠'
];
} else {
return [
self::SHOW_CONDITION_EQ => '=',
self::SHOW_CONDITION_NE => '≠',
self::SHOW_CONDITION_LT => '<',
self::SHOW_CONDITION_GT => '>',
self::SHOW_CONDITION_REGEX => __('regular expression matches', 'fields'),
];
if ($with_treedropdown_conditions) {
$conditions[self::SHOW_CONDITION_UNDER] = __('under', 'fields');
$conditions[self::SHOW_CONDITION_NOT_UNDER] = __('not under', 'fields');
}

if (!$only_simple_conditions) {
$conditions[self::SHOW_CONDITION_LT] = '<';
$conditions[self::SHOW_CONDITION_GT] = '>';
$conditions[self::SHOW_CONDITION_REGEX] = __('regular expression matches', 'fields');
}

return $conditions;
}

public static function getConditionName($condition)
Expand All @@ -108,6 +122,12 @@ public static function getConditionName($condition)
case self::SHOW_CONDITION_REGEX:
echo __('regular expression matches', 'fields');
break;
case self::SHOW_CONDITION_UNDER:
echo __('under', 'fields');
break;
case self::SHOW_CONDITION_NOT_UNDER:
echo __('not under', 'fields');
break;
}
}

Expand Down Expand Up @@ -236,9 +256,12 @@ public static function showSearchOptionCondition($searchoption_id, $itemtype, ?s
if ($so['datatype'] == 'dropdown' || ($so['datatype'] == 'itemlink' && $so['table'] !== $itemtypetable)) {
$twig_params['is_dropdown'] = true;
$twig_params['dropdown_itemtype'] = getItemTypeForTable($so['table']);
$twig_params['list_conditions'] = self::getEnumCondition(true);
$twig_params['list_conditions'] = self::getComparisonOperators(
true,
is_a($twig_params['dropdown_itemtype'], CommonTreeDropdown::class, true)
);
} elseif ($so['datatype'] == 'specific' && get_parent_class($itemtype) == CommonITILObject::getType()) {
$twig_params['list_conditions'] = self::getEnumCondition(true);
$twig_params['list_conditions'] = self::getComparisonOperators(true);
$twig_params['is_specific'] = true;
switch ($so['field']) {
case 'status':
Expand All @@ -261,7 +284,7 @@ public static function showSearchOptionCondition($searchoption_id, $itemtype, ?s
break;
}
} else {
$twig_params['list_conditions'] = self::getEnumCondition(false);
$twig_params['list_conditions'] = self::getComparisonOperators();
}

TemplateRenderer::getInstance()->display('@fields/forms/container_display_condition_so_condition.html.twig', $twig_params);
Expand Down Expand Up @@ -428,6 +451,18 @@ public function checkCondition($item)
}
}
break;
case self::SHOW_CONDITION_UNDER:
$sons = getSonsOf($searchOption['table'], $value);
if (in_array($fields[$searchOption['linkfield']], $sons)) {
return false;
}
break;
case self::SHOW_CONDITION_NOT_UNDER:
$sons = getSonsOf($searchOption['table'], $value);
if (!in_array($fields[$searchOption['linkfield']], $sons)) {
return false;
}
break;
}

return true;
Expand Down