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

Merge branch 'issue310_activity-acl-on-button' into 'master'

Browse Source 
check acl before showing button for creating activity in person/activity

See merge request Chill-Projet/chill-bundles!234
This commit is contained in:
Julien Fastré 2021-11-24 15:14:07 +00:00
commit 05385509ef
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -14,6 +14,8 @@ and this project adheres to
* Use the user.label in accompanying course banner, instead of username; * Use the user.label in accompanying course banner, instead of username;
* fix: show validation message when closing accompanying course; * fix: show validation message when closing accompanying course;
* [thirdparty] link from modal to thirdparty detail page fixed (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/228) * [thirdparty] link from modal to thirdparty detail page fixed (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/228)
* [activity] remove the "plus" button in activity list
* [activity] check ACL on activity list in person context
## Test releases ## Test releases

1
src/Bundle/ChillActivityBundle/Resources/views/Activity/list.html.twig
View File

@ -3,7 +3,6 @@
{% if activities|length == 0 %} {% if activities|length == 0 %}
<p class="chill-no-data-statement"> <p class="chill-no-data-statement">
{{ "There isn't any activities."|trans }} {{ "There isn't any activities."|trans }}
<a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" class="btn btn-sm btn-create"></a>
</p> </p>
{% else %} {% else %}

4
src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig
View File

@ -36,12 +36,14 @@
{% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %} {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %}
{% if is_granted('CHILL_ACTIVITY_CREATE', person) %}
<ul class="record_actions sticky-form-buttons"> <ul class="record_actions sticky-form-buttons">
<li> <li>
<a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}" <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}"
class="btn btn-create disabled" tabindex="-1" role="button" aria-disabled="true">{{ 'Add a new activity' | trans }} class="btn btn-create" tabindex="-1" role="button" aria-disabled="true">{{ 'Create'|trans }}
</a> </a>
</li> </li>
</ul> </ul>
{% endif %}
{% endblock %} {% endblock %}

1
src/Bundle/ChillPersonBundle/Tests/Validator/Person/PersonHasCenterValidatorTest.php
View File

@ -54,6 +54,7 @@ class PersonHasCenterValidatorTest extends ConstraintValidatorTestCase
]); ]);
$prophecy = $this->prophesize(CenterResolverManagerInterface::class); $prophecy = $this->prophesize(CenterResolverManagerInterface::class);
$prophecy->resolveCenters(Argument::type(Person::class), Argument::any())->will(function ($args) { $prophecy->resolveCenters(Argument::type(Person::class), Argument::any())->will(function ($args) {
$center = $args[0]->getCenter(); $center = $args[0]->getCenter();