Skip to content

Do not list agentless agents and restrict agents by Task entity on Actor Taskdropdown #603

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 8 commits into
base: main
Choose a base branch
from
Open

Do not list agentless agents and restrict agents by Task entity on Actor Taskdropdown #603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ec00b0e
Do not list agentless agents on Actor Taskdropdown
eduardomozart Jan 23, 2025
cab4c49
Check "Supported task" for agents on Actors dropdown
eduardomozart Jan 24, 2025
55a9cf1
modulesactive refactor and restrict by task entity
eduardomozart Jan 28, 2025
9c33d53
Update taskjobs.js to restrict by entity based on Task ID
eduardomozart Jan 28, 2025
009c60e
Add taskID parameter used to restrict agents by Entity ID
eduardomozart Jan 28, 2025
c8cfef7
Remove trailling whitespace to fix tests
eduardomozart Jan 28, 2025
7d03c7d
Fix tests
eduardomozart Jan 28, 2025
85c0ade
Uses isAgentCanDo() to filter agents with module enabled
eduardomozart Jan 31, 2025
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
1 change: 1 addition & 0 deletions ajax/taskjob_moduleitems.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
$pfTaskjob = new PluginGlpiinventoryTaskjob();

$params = [
"taskid" => filter_input(INPUT_GET, "taskid"),
"moduletype" => filter_input(INPUT_GET, "moduletype"),
"itemtype" => filter_input(INPUT_GET, "itemtype"),
"method" => filter_input(INPUT_GET, "method"),
Expand Down
27 changes: 24 additions & 3 deletions inc/taskjobview.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,7 @@ public function ajaxModuleItemsDropdown($options)
$moduletype = $options['moduletype'];
$itemtype = $options['itemtype'];
$method = $options['method'];
$taskid = $options['taskid'];
$title = '';
if ($itemtype === "") {
return;
Expand Down Expand Up @@ -427,7 +428,7 @@ public function ajaxModuleItemsDropdown($options)
$modulename = str_replace('DEPLOYINSTALL', 'DEPLOY', strtoupper($method));

// prepare a query to retrieve agent's & computer's id
$iterator = $DB->request([
$crit = [
'SELECT' => [
'agents.id AS agents_id',
'agents.items_id'
Expand Down Expand Up @@ -462,13 +463,33 @@ public function ajaxModuleItemsDropdown($options)
'agents.id',
'agents.items_id'
]
]);
];

$item = getItemForItemtype($itemtype);
if ($item->isEntityAssign()) {
// get entity ID from task ID
$pfTask = new PluginGlpiinventoryTask();
$pfTask->getFromDB($taskid);

$crit['WHERE'] += getEntitiesRestrictCriteria(
'agents',
'',
$pfTask->fields['entities_id'] ?? 0,
$item->maybeRecursive()
);
}

$iterator = $DB->request($crit);

$filter_id = [];
foreach ($iterator as $data_filter) {
if ($itemtype == 'Computer') {
$filter_id[] = $data_filter['items_id'];
} else {
$filter_id[] = $data_filter['agents_id'];
$pfAgentModule = new PluginGlpiinventoryAgentmodule();
if ($pfAgentModule->isAgentCanDo($modulename, $data_filter['agents_id'])) {
$filter_id[] = $data_filter['agents_id'];
}
}
}

Expand Down
3 changes: 3 additions & 0 deletions js/taskjobs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,12 @@ taskjobs.show_moduletypes = function(ajax_url, moduletype) {

taskjobs.show_moduleitems = function(ajax_url, moduletype, itemtype) {
taskjobs.hide_moduleitems_dropdown();
const queryString = window.location.search;
const urlParams = new URLSearchParams(queryString);
$.ajax({
url: ajax_url,
data: {
"taskid" : (typeof urlParams.get('id') !== null ? urlParams.get('id') : 0),
"itemtype" : itemtype,
"moduletype" : moduletype,
"method" : $('#method_selected').text()
Expand Down