Skip to content

fix(forms): Add support for SLA/OLA itemtypes in dropdown questions #23950

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

Draft
ccailly wants to merge 1 commit into
base: 11.0/bugfixes
Choose a base branch
from
+39 −0
Draft

fix(forms): Add support for SLA/OLA itemtypes in dropdown questions #23950

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
8 changes: 8 additions & 0 deletions src/Glpi/Form/QuestionType/QuestionTypeItemDropdown.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,11 @@
use Glpi\Form\Question;
use InvalidArgumentException;
use ITILCategory;
use OLA;
use Override;
use Session;
use SLA;
use SLM;

use function Safe\json_decode;

Expand Down Expand Up @@ -90,6 +93,11 @@ public function getAllowedItemtypes(): array
$value = $key;
});

$dropdown_itemtypes[SLM::getTypeName(Session::getPluralNumber())] = [
SLA::getType() => SLA::getType(),
OLA::getType() => OLA::getType(),
];

return $dropdown_itemtypes;
}

Expand Down
31 changes: 31 additions & 0 deletions tests/functional/Glpi/Form/Migration/FormMigrationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3981,4 +3981,35 @@ public function testFormMigrationActorsWithEmptyDefaultValue(): void
// Assert: migration should be done without error
$this->assertTrue($result->isFullyProcessed());
}

public function testFormMigrationDropdownQuestionWithSLAItemtype(): void
{
global $DB;

// Arrange: create a form with a dropdown question with SLA itemtype
$this->createSimpleFormcreatorForm('Dropdown with SLA itemtype', [
[
'name' => 'SLA dropdown',
'fieldtype' => 'dropdown',
'itemtype' => 'SLA',
'values' => json_encode([
'show_service_level_types' => '0',
'entity_restrict' => '2'
]),
],
]);

// Act: execute migration
$migration = new FormMigration($DB, FormAccessControlManager::getInstance());
$result = $migration->execute();

// Assert: migration should be done without error and the question should be migrated with the correct itemtype
$this->assertTrue($result->isFullyProcessed());
$question = getItemByTypeName(Question::class, 'SLA dropdown');
$config = $question->getExtraDataConfig();
if (!$config instanceof QuestionTypeItemDropdownExtraDataConfig) {
throw new LogicException();
Copy link
Copy Markdown
Contributor

@SebSept SebSept Apr 17, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

a small explanation in LogicException message can be usefull to spot the issue when it happen.

}
$this->assertEquals('SLA', $config->getItemtype());
}
}
Loading