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

Merge remote-tracking branch 'origin/features/activity-form--marc' into features/activity-form

Browse Source
This commit is contained in:
Mathieu Jaumotte
2021-06-04 11:58:33 +02:00
parent a323e84357 4a1ebc1c4c
commit 330234981c
8 changed files with 309 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig
View File

@@ -19,7 +19,13 @@
{{ form_row(edit_form.scope) }}
{% endif %}
.. type
{%- if form.socialActions is defined -%}
{{ form_row(form.socialActions) }}
{% endif %}
{%- if form.socialIssues is defined -%}
{{ form_row(form.socialIssues) }}
{% endif %}
{%- if edit_form.reasons is defined -%}
{{ form_row(edit_form.reasons) }}

11
src/Bundle/ChillActivityBundle/Resources/views/Activity/new.html.twig
View File

@@ -20,9 +20,16 @@
{{ form_row(form.scope) }}
{% endif %}
.. type
{%- if form.socialActions is defined -%}
{{ form_row(form.socialActions) }}
{% endif %}
{%- if form.reasons is defined -%}
{%- if form.socialIssues is defined -%}
{{ form_row(form.socialIssues) }}
{% endif %}
{%- if form.reasons is defined -%}
{{ form_row(form.reasons) }}
{% endif %}