mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-07 18:44:08 +00:00
Merge branch 'draft-periods-without-creator' into 'master'
Display too draft periods without creator in periods of a person See merge request Chill-Projet/chill-bundles!526
This commit is contained in:
commit
1eb78d7273
@ -174,7 +174,10 @@ final class AccompanyingPeriodACLAwareRepository implements AccompanyingPeriodAC
|
||||
->andWhere(
|
||||
$qb->expr()->orX(
|
||||
$qb->expr()->neq('ap.step', ':draft'),
|
||||
$qb->expr()->eq('ap.createdBy', ':creator')
|
||||
$qb->expr()->orX(
|
||||
$qb->expr()->eq('ap.createdBy', ':creator'),
|
||||
$qb->expr()->isNull('ap.createdBy')
|
||||
)
|
||||
)
|
||||
)
|
||||
->setParameter('draft', AccompanyingPeriod::STEP_DRAFT)
|
||||
|
@ -22,6 +22,7 @@
|
||||
|
||||
<div class="col-md-10">
|
||||
<h1>{{ 'My accompanying periods in draft'|trans }}</h1>
|
||||
<p class="help-text">{{ 'Display draft periods created by me'|trans }}</p>
|
||||
|
||||
<div class="flex-table accompanyingcourse-list">
|
||||
{% for period in accompanyingPeriods %}
|
||||
@ -31,7 +32,9 @@
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
{% if accompanyingPeriods|length > 0 %}
|
||||
{{ chill_pagination(pagination) }}
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
|
||||
|
@ -966,6 +966,7 @@ Linked evaluations: Évaluations associées
|
||||
# Accompanying period per user
|
||||
My accompanying periods: Mes parcours
|
||||
My accompanying periods in draft: Mes parcours brouillons
|
||||
Display draft periods created by me: Affiche les parcours en attente de confirmation. Ils ne sont visibles que par moi-même. Ces parcours restent disponibles 15 jours après leur création, avant d'être supprimés automatiquement.
|
||||
Number of periods: Nombre de parcours
|
||||
|
||||
workflow:
|
||||
|
Loading…
x
Reference in New Issue
Block a user