Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-07-05 08:26:13 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Julien Fastré 2020-04-21 13:31:07 +02:00
commit 62403f7b53
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -106,10 +106,15 @@ Version 1.5.15
- [phonenumber validation] allow to validate against mobile **or** landline/voip phonenumbers; - [phonenumber validation] allow to validate against mobile **or** landline/voip phonenumbers;
- [phonenumber validation & format] format and validation does not make the app fail when network is not available; - [phonenumber validation & format] format and validation does not make the app fail when network is not available;
Version 1.5.16
==============
- [translation] in french, replace "Modifier" by "Enregistrer" in the edit form
- [entity render] do not throw an exception when null element are passed to `chill_entity_render_box` and `chill_entity_render_string`
Master branch Master branch
============= =============
- [translation] in french, replace "Modifier" by "Enregistrer" in the edit form
- [chill entity render] fix error when fallback to default entity render (usage of `__toString()`) - [chill entity render] fix error when fallback to default entity render (usage of `__toString()`)
- [CRUD] add step delete - [CRUD] add step delete
- [CRUD] check that action exists before inserting them in edit and view template - [CRUD] check that action exists before inserting them in edit and view template

2
Templating/Entity/ChillEntityRenderExtension.php
View File

@ -83,7 +83,7 @@ class ChillEntityRenderExtension extends AbstractExtension
$this->renders[] = $render; $this->renders[] = $render;
} }
protected function getRender($entity, $options): ChillEntityRenderInterface protected function getRender($entity, $options): ?ChillEntityRenderInterface
{ {
foreach ($this->renders as $render) { foreach ($this->renders as $render) {
if ($render->supports($entity, $options)) { if ($render->supports($entity, $options)) {