Skip to content
This repository has been archived by the owner on Apr 4, 2024. It is now read-only.

Fix problem on dynamic group use plugin fileds criteria, cron not get… #2941

Open
wants to merge 1 commit into
base: glpi9.4
Choose a base branch
from
Open

Fix problem on dynamic group use plugin fileds criteria, cron not get… #2941

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
117 changes: 116 additions & 1 deletion inc/computer.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ function rawSearchOptions() {
'id' => 'fields_plugin',
'name' => __('Plugin fields')
];
$fieldsoptions = plugin_fields_getAddSearchOptions('Computer');
// $fieldsoptions = plugin_fields_getAddSearchOptions('Computer');
// Hack because cron not have profile
$fieldsoptions = $this->pluginFieldsGetAddSearchOptions('Computer');
foreach ($fieldsoptions as $id=>$data) {
$data['id'] = $id;
$options[$id] = $data;
Expand Down Expand Up @@ -212,5 +214,118 @@ static function showMassiveActionsSubForm(MassiveAction $ma) {
return parent::showMassiveActionsSubForm($ma);
}

/**
* Hack of PluginFieldsContainer::getAddSearchOptions
* I remove part of SQL restrict on profile
* when cron run, the offical function return nothing because not have profile
*/
function pluginFieldsGetAddSearchOptions($itemtype, $containers_id = false) {
global $DB;

$opt = [];

$i = 76665;

$query = "SELECT DISTINCT fields.id, fields.name, fields.label, fields.type, fields.is_readonly,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using dbiterator would be much better.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the goal is not rewrite all the plugin field function, but copy it here and remove the 3 lines.
I will propose a complete patch in the plugin fields repository soon

containers.name as container_name, containers.label as container_label,
containers.itemtypes, containers.id as container_id, fields.id as field_id
FROM glpi_plugin_fields_containers containers
INNER JOIN glpi_plugin_fields_fields fields
ON containers.id = fields.plugin_fields_containers_id
AND containers.is_active = 1
WHERE containers.itemtypes LIKE '%$itemtype%'
AND fields.type != 'header'
ORDER BY fields.id ASC";
$res = $DB->query($query);
while ($data = $DB->fetch_assoc($res)) {

if ($containers_id !== false) {
// Filter by container (don't filter by SQL for have $i value with few containers for a itemtype)
if ($data['container_id'] != $containers_id) {
$i++;
continue;
}
}

$tablename = "glpi_plugin_fields_".strtolower($itemtype.
getPlural(preg_replace('/s$/', '', $data['container_name'])));

//get translations
$container = [
'itemtype' => PluginFieldsContainer::getType(),
'id' => $data['container_id'],
'label' => $data['container_label']
];
$data['container_label'] = PluginFieldsLabelTranslation::getLabelFor($container);

$field = [
'itemtype' => PluginFieldsField::getType(),
'id' => $data['field_id'],
'label' => $data['label']
];
$data['label'] = PluginFieldsLabelTranslation::getLabelFor($field);

$opt[$i]['table'] = $tablename;
$opt[$i]['field'] = $data['name'];
$opt[$i]['name'] = $data['container_label']." - ".$data['label'];
$opt[$i]['linkfield'] = $data['name'];
$opt[$i]['joinparams']['jointype'] = "itemtype_item";
$opt[$i]['pfields_type'] = $data['type'];
if ($data['is_readonly']) {
$opt[$i]['massiveaction'] = false;
}

if ($data['type'] === "dropdown") {
$opt[$i]['table'] = 'glpi_plugin_fields_'.$data['name'].'dropdowns';
$opt[$i]['field'] = 'completename';
$opt[$i]['linkfield'] = "plugin_fields_".$data['name']."dropdowns_id";

$opt[$i]['forcegroupby'] = true;

$opt[$i]['joinparams']['jointype'] = "";
$opt[$i]['joinparams']['beforejoin']['table'] = $tablename;
$opt[$i]['joinparams']['beforejoin']['joinparams']['jointype'] = "itemtype_item";
}

if ($data['type'] === "dropdownuser") {
$opt[$i]['table'] = 'glpi_users';
$opt[$i]['field'] = 'name';
$opt[$i]['linkfield'] = $data['name'];
$opt[$i]['right'] = 'all';

$opt[$i]['forcegroupby'] = true;

$opt[$i]['joinparams']['jointype'] = "";
$opt[$i]['joinparams']['beforejoin']['table'] = $tablename;
$opt[$i]['joinparams']['beforejoin']['joinparams']['jointype'] = "itemtype_item";
}

switch ($data['type']) {
case 'dropdown':
case 'dropdownuser':
$opt[$i]['datatype'] = "dropdown";
break;
case 'yesno':
$opt[$i]['datatype'] = "bool";
break;
case 'textarea':
$opt[$i]['datatype'] = "text";
break;
case 'number':
$opt[$i]['datatype'] = "number";
break;
case 'date':
case 'datetime':
$opt[$i]['datatype'] = $data['type'];
break;
default:
$opt[$i]['datatype'] = "string";
}

$i++;
}

return $opt;
}

}