Skip to content

Commit cfbdef9

Browse files
committed
fix(glpiselectfield): prevent use of the field with non existing itemtype
Signed-off-by: Thierry Bugier <[email protected]>
1 parent b4d0e58 commit cfbdef9

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

inc/fields/glpiselectfield.class.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131

3232
class PluginFormcreatorGlpiselectField extends PluginFormcreatorDropdownField
3333
{
34-
public function isPrerequisites() {
35-
return true;
36-
}
37-
3834
public function getDesignSpecializationField() {
3935
$rand = mt_rand();
4036

tests/suite-unit/PluginFormcreatorDropdownField.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,17 @@ public function testIsAnonymousFormCompatible() {
108108

109109
public function testIsPrerequisites() {
110110
$instance = $this->newTestedInstance(new \PluginFormcreatorQuestion());
111+
$instance = $this->newTestedInstance($this->getQuestion([
112+
'values' => \Computer::class
113+
]));
111114
$output = $instance->isPrerequisites();
112115
$this->boolean($output)->isEqualTo(true);
116+
117+
$instance = $this->newTestedInstance($this->getQuestion([
118+
'values' => \UndefinedItemtype::class
119+
]));
120+
$output = $instance->isPrerequisites();
121+
$this->boolean($output)->isEqualTo(false);
113122
}
114123

115124
public function testGetValueForDesign() {

tests/suite-unit/PluginFormcreatorSelectField.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,6 @@ public function testIsAnonymousFormCompatible() {
152152
$this->boolean($output)->isTrue();
153153
}
154154

155-
public function testIsPrerequisites() {
156-
$instance = $this->newTestedInstance($this->getQuestion());
157-
$output = $instance->isPrerequisites();
158-
$this->boolean($output)->isEqualTo(true);
159-
}
160-
161155
public function testCanRequire() {
162156
$instance = new \PluginFormcreatorSelectField($this->getQuestion());
163157
$output = $instance->canRequire();

0 commit comments

Comments
 (0)