Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 21:34:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

Improve isChecked

Browse Source
This commit is contained in:
Julien Fastré 2018-06-13 16:45:21 +02:00
parent 0371236493
commit 23e68416a2
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CustomFields/CustomFieldChoice.php
View File

@ -363,17 +363,22 @@ class CustomFieldChoice extends AbstractCustomField
public function isChecked(CustomField $cf, $choiceSlug, $data)
{
$deserialized = $this->deserialize($data, $cf);
if ($deserialized === null) {
if ($data === null) {
return false;
}
dump($deserialized);
if ($cf->getOptions()[self::MULTIPLE]) {
return \in_array($choiceSlug, $deserialized);
if ($cf->getOptions()[self::ALLOW_OTHER]) {
return \in_array($choiceSlug, $data['_choices']);
} else {
return \in_array($choiceSlug, $data);
}
} else {
return $data === $choiceSlug;
if ($cf->getOptions()[self::ALLOW_OTHER]) {
return $data['_choices'] === $choiceSlug;
} else {
return $data === $choiceSlug;
}
}
}
@ -389,8 +394,6 @@ class CustomFieldChoice extends AbstractCustomField
public function extractOtherValue(CustomField $cf, array $data = null)
{
dump('extracting');
dump($data);
return $data['_other'];
}
}

1
Resources/config/services.yml
View File

@ -6,6 +6,7 @@ services:
class: Chill\CustomFieldsBundle\Service\CustomFieldProvider
call:
- [setContainer, ["@service_container"]]
Chill\CustomFieldsBundle\Service\CustomFieldProvider: '@chill.custom_field.provider'
chill.custom_field.custom_field_choice_type:
class: Chill\CustomFieldsBundle\Form\CustomFieldType