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

Update path to twig template with new syntax

Browse Source
This commit is contained in:
Julien Fastré
2023-07-28 12:16:50 +02:00
parent 55b8502896
commit e839b03cc9
111 changed files with 220 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Bundle/ChillActivityBundle/Controller/ActivityController.php
View File

@@ -91,10 +91,10 @@ final class ActivityController extends AbstractController
}
if ($activity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
$view = 'ChillActivityBundle:Activity:confirm_deleteAccompanyingCourse.html.twig';
$view = '@ChillActivity/Activity/confirm_deleteAccompanyingCourse.html.twig';
$accompanyingPeriod = $activity->getAccompanyingPeriod();
} else {
$view = 'ChillActivityBundle:Activity:confirm_deletePerson.html.twig';
$view = '@ChillActivity/Activity/confirm_deletePerson.html.twig';
}
// TODO
@@ -164,10 +164,10 @@ final class ActivityController extends AbstractController
$person = $entity->getPerson();
if ($entity->getAccompanyingPeriod() instanceof AccompanyingPeriod) {
$view = 'ChillActivityBundle:Activity:editAccompanyingCourse.html.twig';
$view = '@ChillActivity/Activity/editAccompanyingCourse.html.twig';
$accompanyingPeriod = $entity->getAccompanyingPeriod();
} else {
$view = 'ChillActivityBundle:Activity:editPerson.html.twig';
$view = '@ChillActivity/Activity/editPerson.html.twig';
}
// TODO
// $this->denyAccessUnlessGranted('CHILL_ACTIVITY_UPDATE', $entity);
@@ -283,7 +283,7 @@ final class ActivityController extends AbstractController
]);
$this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
$view = 'ChillActivityBundle:Activity:listPerson.html.twig';
$view = '@ChillActivity/Activity/listPerson.html.twig';
} elseif ($accompanyingPeriod instanceof AccompanyingPeriod) {
$this->denyAccessUnlessGranted(ActivityVoter::SEE, $accompanyingPeriod);
@@ -299,7 +299,7 @@ final class ActivityController extends AbstractController
$filterArgs
);
$view = 'ChillActivityBundle:Activity:listAccompanyingCourse.html.twig';
$view = '@ChillActivity/Activity/listAccompanyingCourse.html.twig';
} else {
throw new \LogicException("Unsupported");
}
@@ -358,9 +358,9 @@ final class ActivityController extends AbstractController
[$person, $accompanyingPeriod] = $this->getEntity($request);
if ($accompanyingPeriod instanceof AccompanyingPeriod) {
$view = 'ChillActivityBundle:Activity:newAccompanyingCourse.html.twig';
$view = '@ChillActivity/Activity/newAccompanyingCourse.html.twig';
} elseif ($person instanceof Person) {
$view = 'ChillActivityBundle:Activity:newPerson.html.twig';
$view = '@ChillActivity/Activity/newPerson.html.twig';
}
$activityType_id = $request->get('activityType_id', 0);
@@ -538,9 +538,9 @@ final class ActivityController extends AbstractController
[$person, $accompanyingPeriod] = $this->getEntity($request);
if ($accompanyingPeriod instanceof AccompanyingPeriod) {
$view = 'ChillActivityBundle:Activity:selectTypeAccompanyingCourse.html.twig';
$view = '@ChillActivity/Activity/selectTypeAccompanyingCourse.html.twig';
} elseif ($person instanceof Person) {
$view = 'ChillActivityBundle:Activity:selectTypePerson.html.twig';
$view = '@ChillActivity/Activity/selectTypePerson.html.twig';
}
$data = [];
@@ -587,9 +587,9 @@ final class ActivityController extends AbstractController
$person = $entity->getPerson();
if ($accompanyingPeriod instanceof AccompanyingPeriod) {
$view = 'ChillActivityBundle:Activity:showAccompanyingCourse.html.twig';
$view = '@ChillActivity/Activity/showAccompanyingCourse.html.twig';
} elseif ($person instanceof Person) {
$view = 'ChillActivityBundle:Activity:showPerson.html.twig';
$view = '@ChillActivity/Activity/showPerson.html.twig';
} else {
throw new RuntimeException('the activity should be linked with a period or person');
}

12
src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
View File

@@ -45,7 +45,7 @@ class ActivityReasonController extends AbstractController
return $this->redirectToRoute('chill_activity_activityreason', ['id' => $entity->getId()]);
}
return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', [
return $this->render('@ChillActivity/ActivityReason/new.html.twig', [
'entity' => $entity,
'form' => $form->createView(),
]);
@@ -66,7 +66,7 @@ class ActivityReasonController extends AbstractController
$editForm = $this->createEditForm($entity);
return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', [
return $this->render('@ChillActivity/ActivityReason/edit.html.twig', [
'entity' => $entity,
'edit_form' => $editForm->createView(),
]);
@@ -81,7 +81,7 @@ class ActivityReasonController extends AbstractController
$entities = $this->activityReasonRepository->findAll();
return $this->render('ChillActivityBundle:ActivityReason:index.html.twig', [
return $this->render('@ChillActivity/ActivityReason/index.html.twig', [
'entities' => $entities,
]);
}
@@ -94,7 +94,7 @@ class ActivityReasonController extends AbstractController
$entity = new ActivityReason();
$form = $this->createCreateForm($entity);
return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', [
return $this->render('@ChillActivity/ActivityReason/new.html.twig', [
'entity' => $entity,
'form' => $form->createView(),
]);
@@ -113,7 +113,7 @@ class ActivityReasonController extends AbstractController
throw $this->createNotFoundException('Unable to find ActivityReason entity.');
}
return $this->render('ChillActivityBundle:ActivityReason:show.html.twig', [
return $this->render('@ChillActivity/ActivityReason/show.html.twig', [
'entity' => $entity,
]);
}
@@ -140,7 +140,7 @@ class ActivityReasonController extends AbstractController
return $this->redirectToRoute('chill_activity_activityreason', ['id' => $id]);
}
return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', [
return $this->render('@ChillActivity/ActivityReason/edit.html.twig', [
'entity' => $entity,
'edit_form' => $editForm->createView(),
]);

2
src/Bundle/ChillActivityBundle/Controller/AdminController.php
View File

@@ -20,7 +20,7 @@ class AdminController extends AbstractController
{
public function indexActivityAction()
{
return $this->render('ChillActivityBundle:Admin:layout_activity.html.twig');
return $this->render('@ChillActivity/Admin/layout_activity.html.twig');
}
public function redirectToAdminIndexAction()

2
src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
View File

@@ -75,7 +75,7 @@
{% endif %}
</div>
{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
{% include '@ChillActivity/Activity/concernedGroups.html.twig' with {
'context': context,
'render': 'wrap-list',
'entity': activity,

2
src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig
View File

@@ -8,7 +8,7 @@
<div class="activity-edit">
<div id="activity"></div> {# <=== vue component #}
{% include 'ChillActivityBundle:Activity:edit.html.twig' %}
{% include '@ChillActivity/Activity/edit.html.twig' %}
</div>
{% endblock %}

2
src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig
View File

@@ -24,7 +24,7 @@
<div class="activity-edit">
<div id="activity"></div> {# <=== vue component #}
{% include 'ChillActivityBundle:Activity:edit.html.twig' %}
{% include '@ChillActivity/Activity/edit.html.twig' %}
</div>
{% endblock %}

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

@@ -91,7 +91,7 @@
<div class="flex-table activity-list">
{% for activity in activities %}
{% include 'ChillActivityBundle:Activity:_list_item.html.twig' with {
{% include '@ChillActivity/Activity/_list_item.html.twig' with {
'context': context,
'recordAction': _self.recordAction(activity, context, person_id, accompanying_course_id)
} %}

2
src/Bundle/ChillActivityBundle/Resources/views/Activity/listAccompanyingCourse.html.twig
View File

@@ -31,7 +31,7 @@
<h1>{{ 'Activity list' |trans }}</h1>
{% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'accompanyingCourse'} %}
{% include '@ChillActivity/Activity/list.html.twig' with {'context': 'accompanyingCourse'} %}
{% if is_granted('CHILL_ACTIVITY_CREATE', accompanyingCourse) %}
<ul class="record_actions sticky-form-buttons">

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

@@ -46,7 +46,7 @@
<h1>{{ 'Activity list' |trans }}</h1>
{% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %}
{% include '@ChillActivity/Activity/list.html.twig' with {'context': 'person'} %}
{% if is_granted('CHILL_ACTIVITY_CREATE', person) %}
<ul class="record_actions sticky-form-buttons">

2
src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig
View File

@@ -8,7 +8,7 @@
<div class="activity-new">
<div id="activity"></div> {# <=== vue component #}
{% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'accompanyingCourse'} %}
{% include '@ChillActivity/Activity/new.html.twig' with {'context': 'accompanyingCourse'} %}
</div>
{% endblock %}

2
src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig
View File

@@ -8,7 +8,7 @@
<div class="activity-new">
<div id="activity"></div> {# <=== vue component #}
{% include 'ChillActivityBundle:Activity:new.html.twig' with {'context': 'person'} %}
{% include '@ChillActivity/Activity/new.html.twig' with {'context': 'person'} %}
</div>
{% endblock %}

2
src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypeAccompanyingCourse.html.twig
View File

@@ -5,5 +5,5 @@
{% block title 'Activity creation'|trans %}
{% block content %}
{% include 'ChillActivityBundle:Activity:selectType.html.twig' %}
{% include '@ChillActivity/Activity/selectType.html.twig' %}
{% endblock %}

2
src/Bundle/ChillActivityBundle/Resources/views/Activity/selectTypePerson.html.twig
View File

@@ -5,5 +5,5 @@
{% block title 'Activity creation'|trans %}
{% block content %}
{% include 'ChillActivityBundle:Activity:selectType.html.twig' %}
{% include '@ChillActivity/Activity/selectType.html.twig' %}
{% endblock %}

2
src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
View File

@@ -88,7 +88,7 @@
<h2 class="chill-blue">{{ 'Concerned groups'|trans }}</h2>
{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
{% include '@ChillActivity/Activity/concernedGroups.html.twig' with {
'context': context,
'render': 'bloc',
'badge_person': true

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

@@ -18,11 +18,11 @@
{{ encore_entry_link_tags('mod_document_action_buttons_group') }}
{% endblock %}
{% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
{% import '@ChillActivity/ActivityReason/macro.html.twig' as m %}
{% block content -%}
<div class="activity-show">
{% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'accompanyingCourse'} %}
{% include '@ChillActivity/Activity/show.html.twig' with {'context': 'accompanyingCourse'} %}
</div>
{% endblock content %}

2
src/Bundle/ChillActivityBundle/Resources/views/Activity/showInNotification.html.twig
View File

@@ -8,7 +8,7 @@
{% if activity is not null %}
<div class="flex-table">
{% if is_granted('CHILL_ACTIVITY_SEE', activity) %}
{% include 'ChillActivityBundle:Activity:_list_item.html.twig' with {
{% include '@ChillActivity/Activity/_list_item.html.twig' with {
'recordAction': _self.recordAction(activity),
'context': 'accompanyingCourse',
'itemBlocClass': 'bg-chill-llight-gray'

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

@@ -16,11 +16,11 @@
{{ encore_entry_link_tags('mod_document_action_buttons_group') }}
{% endblock %}
{% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
{% import '@ChillActivity/ActivityReason/macro.html.twig' as m %}
{% block content -%}
<div class="activity-show">
{% include 'ChillActivityBundle:Activity:show.html.twig' with {'context': 'person'} %}
{% include '@ChillActivity/Activity/show.html.twig' with {'context': 'person'} %}
</div>
{% endblock %}

2
src/Bundle/ChillActivityBundle/Resources/views/Timeline/activity_person_context.html.twig
View File

@@ -1,4 +1,4 @@
{% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
{% import '@ChillActivity/ActivityReason/macro.html.twig' as m %}
<div>
<h3>{{ activity.date|format_date('long') }}<span class="activity"> / {{ 'Activity'|trans }}</span>{% if 'person' != context %} / {{ activity.person|chill_entity_render_box({'addLink': true}) }}{% endif %}</h3>

2
src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
View File

@@ -90,7 +90,7 @@ class TimelineActivityProvider implements TimelineProviderInterface
$this->checkContext($context);
return [
'template' => 'ChillActivityBundle:Timeline:activity_person_context.html.twig',
'template' => '@ChillActivity/Timeline/activity_person_context.html.twig',
'template_data' => [
'activity' => $entity,
'context' => $context,

4
src/Bundle/ChillBudgetBundle/Controller/ElementController.php
View File

@@ -51,7 +51,7 @@ class ElementController extends AbstractController
$results = $this->calculator->calculateDefault($elements);
}
return $this->render('ChillBudgetBundle:Person:index.html.twig', [
return $this->render('@ChillBudget/Person/index.html.twig', [
'person' => $person,
'charges' => $charges,
'resources' => $resources,
@@ -75,7 +75,7 @@ class ElementController extends AbstractController
$results = $this->calculator->calculateDefault($elements);
}
return $this->render('ChillBudgetBundle:Household:index.html.twig', [
return $this->render('@ChillBudget/Household/index.html.twig', [
'household' => $household,
'charges' => $charges,
'resources' => $resources,

2
src/Bundle/ChillBudgetBundle/Resources/views/Budget/_future_budget.html.twig
View File

@@ -1,4 +1,4 @@
{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_elements, table_results %}
{% from '@ChillBudget/Budget/_macros.html.twig' import table_elements, table_results %}
<div class="accordion" id="future_{{ entity.id }}">
<div class="accordion-item">

2
src/Bundle/ChillBudgetBundle/Resources/views/Budget/_past_budget.html.twig
View File

@@ -1,4 +1,4 @@
{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_elements, table_results %}
{% from '@ChillBudget/Budget/_macros.html.twig' import table_elements, table_results %}
<div class="accordion" id="past_{{ entity.id }}">
<div class="accordion-item">

2
src/Bundle/ChillBudgetBundle/Resources/views/Charge/confirm_delete.html.twig
View File

@@ -18,7 +18,7 @@
{% block content %}
{{ include('ChillMainBundle:Util:confirmation_template.html.twig',
{{ include('@ChillMain/Util/confirmation_template.html.twig',
{
'title' : 'Remove charge'|trans,
'confirm_question' : confirm_question,

6
src/Bundle/ChillBudgetBundle/Resources/views/Household/index.html.twig
View File

@@ -1,6 +1,6 @@
{% extends "@ChillPerson/Household/layout.html.twig" %}
{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_elements, table_results %}
{% from '@ChillBudget/Budget/_macros.html.twig' import table_elements, table_results %}
{% set activeRouteKey = '' %}
{% set title = 'Budget for household %household%'|trans({ '%household%' : household.id } ) %}
@@ -17,7 +17,7 @@
{% block content %}
<h1>{{ title }}</h1>
{% include 'ChillBudgetBundle:Budget:_budget.html.twig' with {
{% include '@ChillBudget/Budget/_budget.html.twig' with {
'resources': resources,
'charges': charges,
'household': household
@@ -57,7 +57,7 @@
<h2 class="mt-4">{{ 'Budget for %name%'|trans({'%name%': member.firstName ~ " " ~ member.lastName }) }}</h2>
{% include 'ChillBudgetBundle:Budget:_budget.html.twig' with {
{% include '@ChillBudget/Budget/_budget.html.twig' with {
'resources': member.getBudgetResources,
'charges': member.getBudgetCharges,
'person': member

2
src/Bundle/ChillBudgetBundle/Resources/views/Person/index.html.twig
View File

@@ -1,6 +1,6 @@
{% extends "@ChillPerson/Person/layout.html.twig" %}
{% from 'ChillBudgetBundle:Budget:_macros.html.twig' import table_results %}
{% from '@ChillBudget/Budget/_macros.html.twig' import table_results %}
{% set activeRouteKey = '' %}
{% set title = 'Budget for %name%'|trans({ '%name%' : person.firstName ~ " " ~ person.lastName } ) %}

2
src/Bundle/ChillBudgetBundle/Resources/views/Resource/confirm_delete.html.twig
View File

@@ -18,7 +18,7 @@
{% block content %}
{{ include('ChillMainBundle:Util:confirmation_template.html.twig',
{{ include('@ChillMain/Util/confirmation_template.html.twig',
{
'title' : 'Remove resource'|trans,
'confirm_question' : confirm_question,

2
src/Bundle/ChillCalendarBundle/Controller/AdminController.php
View File

@@ -23,6 +23,6 @@ class AdminController extends AbstractController
*/
public function indexAdminAction()
{
return $this->render('ChillCalendarBundle:Admin:index.html.twig');
return $this->render('@ChillCalendar/Admin/index.html.twig');
}
}

2
src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
View File

@@ -69,7 +69,7 @@
or calendar.users|length > 0 %}
<div class="item-row details separator">
<div class="item-col">
{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
{% include '@ChillActivity/Activity/concernedGroups.html.twig' with {
'context': calendar.context == 'person' ? 'calendar_person' : 'calendar_accompanyingCourse',
'render': 'wrap-list',
'entity': calendar

2
src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByAccompanyingCourse.html.twig
View File

@@ -7,7 +7,7 @@
{% block content %}
<div class="calendar-edit">
{% include 'ChillCalendarBundle:Calendar:edit.html.twig' with {'context': 'accompanyingCourse'} %}
{% include '@ChillCalendar/Calendar/edit.html.twig' with {'context': 'accompanyingCourse'} %}
</div>
{% endblock %}

2
src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByPerson.html.twig
View File

@@ -7,7 +7,7 @@
{% block content %}
<div class="calendar-edit">
{% include 'ChillCalendarBundle:Calendar:edit.html.twig' with {'context': 'person'} %}
{% include '@ChillCalendar/Calendar/edit.html.twig' with {'context': 'person'} %}
</div>
{% endblock %}

2
src/Bundle/ChillCalendarBundle/Resources/views/Calendar/editByUser.html.twig
View File

@@ -6,7 +6,7 @@
<div class="calendar-edit">
<div id="calendar"></div> {# <=== vue component #}
{% include 'ChillCalendarBundle:Calendar:edit.html.twig' with {'context': 'user'} %}
{% include '@ChillCalendar/Calendar/edit.html.twig' with {'context': 'user'} %}
</div>
{% endblock %}

2
src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newByAccompanyingCourse.html.twig
View File

@@ -8,7 +8,7 @@
<div class="calendar-new">
<div id="calendar"></div> {# <=== vue component #}
{% include 'ChillCalendarBundle:Calendar:new.html.twig' with {'context': 'accompanyingCourse'} %}
{% include '@ChillCalendar/Calendar/new.html.twig' with {'context': 'accompanyingCourse'} %}
</div>
{% endblock %}

2
src/Bundle/ChillCalendarBundle/Resources/views/Calendar/newByPerson.html.twig
View File

@@ -8,7 +8,7 @@
<div class="calendar-new">
<div id="calendar"></div> {# <=== vue component #}
{% include 'ChillCalendarBundle:Calendar:new.html.twig' with {'context': 'person'} %}
{% include '@ChillCalendar/Calendar/new.html.twig' with {'context': 'person'} %}
</div>
{% endblock %}

2
src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
View File

@@ -15,7 +15,7 @@
</dl>
<h2 class="chill-red">{{ 'Concerned groups calendar'|trans }}</h2>
{% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': 'calendar_' ~ context, 'render': 'bloc' } %}
{% include '@ChillActivity/Activity/concernedGroups.html.twig' with {'context': 'calendar_' ~ context, 'render': 'bloc' } %}
<h2 class="chill-red">{{ 'Calendar data'|trans }}</h2>

2
src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByAccompanyingCourse.html.twig
View File

@@ -7,7 +7,7 @@
{% block content -%}
<div class="calendar-show">
{% include 'ChillCalendarBundle:Calendar:show.html.twig' with {'context': 'accompanyingCourse'} %}
{% include '@ChillCalendar/Calendar/show.html.twig' with {'context': 'accompanyingCourse'} %}
</div>
{% endblock content %}

2
src/Bundle/ChillCalendarBundle/Resources/views/Calendar/showByUser.html.twig
View File

@@ -5,7 +5,7 @@
{% block content -%}
<div class="calendar-show">
{% include 'ChillCalendarBundle:Calendar:show.html.twig' with {'context': 'user'} %}
{% include '@ChillCalendar/Calendar/show.html.twig' with {'context': 'user'} %}
</div>
{% endblock content %}

2
src/Bundle/ChillDocGeneratorBundle/Resources/views/Generator/basic_form.html.twig
View File

@@ -1,4 +1,4 @@
{% extends 'ChillMainBundle::layout.html.twig' %}
{% extends '@ChillMain/layout.html.twig' %}
{% block title 'docgen.Generate a document'|trans %}

2
src/Bundle/ChillDocStoreBundle/Controller/AdminController.php
View File

@@ -23,7 +23,7 @@ class AdminController extends AbstractController
*/
public function indexAction()
{
return $this->render('ChillDocStoreBundle:Admin:layout.html.twig');
return $this->render('@ChillDocStore/Admin/layout.html.twig');
}
/**

8
src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
View File

@@ -68,7 +68,7 @@ class DocumentCategoryController extends AbstractController
'idInsideBundle' => $documentCategory->getIdInsideBundle(), ]);
}
return $this->render('ChillDocStoreBundle:DocumentCategory:edit.html.twig', [
return $this->render('@ChillDocStore/DocumentCategory/edit.html.twig', [
'document_category' => $documentCategory,
'form' => $form->createView(),
]);
@@ -83,7 +83,7 @@ class DocumentCategoryController extends AbstractController
$categories = $em->getRepository(DocumentCategory::class)->findAll();
return $this->render(
'ChillDocStoreBundle:DocumentCategory:index.html.twig',
'@ChillDocStore/DocumentCategory/index.html.twig',
[
'document_categories' => $categories,
]
@@ -122,7 +122,7 @@ class DocumentCategoryController extends AbstractController
return $this->redirectToRoute('document_category_index');
}
return $this->render('ChillDocStoreBundle:DocumentCategory:new.html.twig', [
return $this->render('@ChillDocStore/DocumentCategory/new.html.twig', [
'document_category' => $documentCategory,
'form' => $form->createView(),
]);
@@ -141,7 +141,7 @@ class DocumentCategoryController extends AbstractController
);
return $this->render(
'ChillDocStoreBundle:DocumentCategory:show.html.twig',
'@ChillDocStore/DocumentCategory/show.html.twig',
['document_category' => $documentCategory]
);
}

8
src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
View File

@@ -75,7 +75,7 @@ class DocumentPersonController extends AbstractController
}
return $this->render(
'ChillDocStoreBundle:PersonDocument:delete.html.twig',
'@ChillDocStore/PersonDocument/delete.html.twig',
[
'document' => $document,
'delete_form' => $form->createView(),
@@ -134,7 +134,7 @@ class DocumentPersonController extends AbstractController
$this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
return $this->render(
'ChillDocStoreBundle:PersonDocument:edit.html.twig',
'@ChillDocStore/PersonDocument/edit.html.twig',
[
'document' => $document,
'form' => $form->createView(),
@@ -184,7 +184,7 @@ class DocumentPersonController extends AbstractController
$this->addFlash('error', $this->translator->trans('This form contains errors'));
}
return $this->render('ChillDocStoreBundle:PersonDocument:new.html.twig', [
return $this->render('@ChillDocStore/PersonDocument/new.html.twig', [
'document' => $document,
'form' => $form->createView(),
'person' => $person,
@@ -207,7 +207,7 @@ class DocumentPersonController extends AbstractController
$this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
return $this->render(
'ChillDocStoreBundle:PersonDocument:show.html.twig',
'@ChillDocStore/PersonDocument/show.html.twig',
['document' => $document, 'person' => $person]
);
}

2
src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/edit.html.twig
View File

@@ -6,7 +6,7 @@
<h1>{{ 'Document category edit'|trans }}</h1>
{# DISABLED
{{ include('ChillDocStoreBundle:DocumentCategory:_form.html.twig', {'button_label': 'Update'}) }}
{{ include('@ChillDocStore/DocumentCategory/_form.html.twig', {'button_label': 'Update'}) }}
#}
{{ form_start(form) }}

2
src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/new.html.twig
View File

@@ -6,7 +6,7 @@
<h1>{{ 'Create new DocumentCategory' | trans }}</h1>
{# DISABLED
{{ include('ChillDocStoreBundle:DocumentCategory:_form.html.twig') }}
{{ include('@ChillDocStore/DocumentCategory/_form.html.twig') }}
#}
{{ form_start(form) }}

2
src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/show.html.twig
View File

@@ -36,7 +36,7 @@
class="btn btn-edit">{{ 'Edit' | trans }}</a>
</li>
<li>
{{ include('ChillDocStoreBundle:DocumentCategory:_delete_form.html.twig') }}
{{ include('@ChillDocStore/DocumentCategory/_delete_form.html.twig') }}
</li>
</ul>
{% endblock %}

2
src/Bundle/ChillEventBundle/Controller/AdminController.php
View File

@@ -27,6 +27,6 @@ class AdminController extends AbstractController
*/
public function indexAdminAction()
{
return $this->render('ChillEventBundle:Admin:index.html.twig');
return $this->render('@ChillEvent/Admin/index.html.twig');
}
}

14
src/Bundle/ChillEventBundle/Controller/EventController.php
View File

@@ -132,7 +132,7 @@ class EventController extends AbstractController
}
}
return $this->render('ChillEventBundle:Event:confirm_delete.html.twig', [
return $this->render('@ChillEvent/Event/confirm_delete.html.twig', [
'event_id' => $event->getId(),
'delete_form' => $form->createView(),
]);
@@ -157,7 +157,7 @@ class EventController extends AbstractController
$editForm = $this->createEditForm($entity);
return $this->render('ChillEventBundle:Event:edit.html.twig', [
return $this->render('@ChillEvent/Event/edit.html.twig', [
'entity' => $entity,
'edit_form' => $editForm->createView(),
]);
@@ -209,7 +209,7 @@ class EventController extends AbstractController
$addEventParticipationByPersonForm = $this->createAddEventParticipationByPersonForm($person);
return $this->render('ChillEventBundle:Event:listByPerson.html.twig', [
return $this->render('@ChillEvent/Event/listByPerson.html.twig', [
'participations' => $participations,
'person' => $person,
'paginator' => $paginator,
@@ -255,7 +255,7 @@ class EventController extends AbstractController
return $this->redirectToRoute('chill_event__event_show', ['event_id' => $entity->getId()]);
}
return $this->render('ChillEventBundle:Event:new.html.twig', [
return $this->render('@ChillEvent/Event/new.html.twig', [
'entity' => $entity,
'form' => $form->createView(),
]);
@@ -298,7 +298,7 @@ class EventController extends AbstractController
])
->getForm();
return $this->render('ChillEventBundle:Event:newPickCenter.html.twig', [
return $this->render('@ChillEvent/Event/newPickCenter.html.twig', [
'form' => $form->createView(),
]);
}
@@ -332,7 +332,7 @@ class EventController extends AbstractController
return $exportParticipationsList['response'];
}
return $this->render('ChillEventBundle:Event:show.html.twig', [
return $this->render('@ChillEvent/Event/show.html.twig', [
'event' => $event,
'form_add_participation_by_person' => $addParticipationByPersonForm->createView(),
'form_export' => $exportParticipationsList['form']->createView(),
@@ -366,7 +366,7 @@ class EventController extends AbstractController
return $this->redirectToRoute('chill_event__event_edit', ['event_id' => $event_id]);
}
return $this->render('ChillEventBundle:Event:edit.html.twig', [
return $this->render('@ChillEvent/Event/edit.html.twig', [
'entity' => $entity,
'edit_form' => $editForm->createView(),
]);

12
src/Bundle/ChillEventBundle/Controller/EventTypeController.php
View File

@@ -39,7 +39,7 @@ class EventTypeController extends AbstractController
return $this->redirectToRoute('chill_eventtype_admin', ['id' => $entity->getId()]);
}
return $this->render('ChillEventBundle:EventType:new.html.twig', [
return $this->render('@ChillEvent/EventType/new.html.twig', [
'entity' => $entity,
'form' => $form->createView(),
]);
@@ -84,7 +84,7 @@ class EventTypeController extends AbstractController
$editForm = $this->createEditForm($entity);
$deleteForm = $this->createDeleteForm($id);
return $this->render('ChillEventBundle:EventType:edit.html.twig', [
return $this->render('@ChillEvent/EventType/edit.html.twig', [
'entity' => $entity,
'edit_form' => $editForm->createView(),
'delete_form' => $deleteForm->createView(),
@@ -100,7 +100,7 @@ class EventTypeController extends AbstractController
$entities = $em->getRepository(\Chill\EventBundle\Entity\EventType::class)->findAll();
return $this->render('ChillEventBundle:EventType:index.html.twig', [
return $this->render('@ChillEvent/EventType/index.html.twig', [
'entities' => $entities,
]);
}
@@ -113,7 +113,7 @@ class EventTypeController extends AbstractController
$entity = new EventType();
$form = $this->createCreateForm($entity);
return $this->render('ChillEventBundle:EventType:new.html.twig', [
return $this->render('@ChillEvent/EventType/new.html.twig', [
'entity' => $entity,
'form' => $form->createView(),
]);
@@ -134,7 +134,7 @@ class EventTypeController extends AbstractController
$deleteForm = $this->createDeleteForm($id);
return $this->render('ChillEventBundle:EventType:show.html.twig', [
return $this->render('@ChillEvent/EventType/show.html.twig', [
'entity' => $entity,
'delete_form' => $deleteForm->createView(),
]);
@@ -163,7 +163,7 @@ class EventTypeController extends AbstractController
return $this->redirectToRoute('chill_eventtype_admin', ['id' => $id]);
}
return $this->render('ChillEventBundle:EventType:edit.html.twig', [
return $this->render('@ChillEvent/EventType/edit.html.twig', [
'entity' => $entity,
'edit_form' => $editForm->createView(),
'delete_form' => $deleteForm->createView(),

20
src/Bundle/ChillEventBundle/Controller/ParticipationController.php
View File

@@ -197,7 +197,7 @@ class ParticipationController extends AbstractController
]);
}
return $this->render('ChillEventBundle:Participation:new.html.twig', [
return $this->render('@ChillEvent/Participation/new.html.twig', [
'form' => $form->createView(),
'participation' => $participation,
]);
@@ -238,7 +238,7 @@ class ParticipationController extends AbstractController
]);
}
return $this->render('ChillEventBundle:Participation:new.html.twig', [
return $this->render('@ChillEvent/Participation/new.html.twig', [
'form' => $form->createView(),
'participation' => $participation,
]);
@@ -284,7 +284,7 @@ class ParticipationController extends AbstractController
}
}
return $this->render('ChillEventBundle:Participation:confirm_delete.html.twig', [
return $this->render('@ChillEvent/Participation/confirm_delete.html.twig', [
'event_id' => $event->getId(),
'delete_form' => $form->createView(),
]);
@@ -315,7 +315,7 @@ class ParticipationController extends AbstractController
$form = $this->createEditForm($participation);
return $this->render('ChillEventBundle:Participation:edit.html.twig', [
return $this->render('@ChillEvent/Participation/edit.html.twig', [
'form' => $form->createView(),
'participation' => $participation,
]);
@@ -369,7 +369,7 @@ class ParticipationController extends AbstractController
$form = $this->createEditFormMultiple($event->getParticipations(), $event);
return $this->render('ChillEventBundle:Participation:edit-multiple.html.twig', [
return $this->render('@ChillEvent/Participation/edit-multiple.html.twig', [
'event' => $event,
'participations' => $event->getParticipations(),
'form' => $form->createView(),
@@ -452,7 +452,7 @@ class ParticipationController extends AbstractController
]);
}
return $this->render('ChillEventBundle:Participation:edit.html.twig', [
return $this->render('@ChillEvent/Participation/edit.html.twig', [
'form' => $form->createView(),
'participation' => $participation,
]);
@@ -495,7 +495,7 @@ class ParticipationController extends AbstractController
);
}
return $this->render('ChillEventBundle:Participation:edit-multiple.html.twig', [
return $this->render('@ChillEvent/Participation/edit-multiple.html.twig', [
'event' => $event,
'participations' => $event->getParticipations(),
'form' => $form->createView(),
@@ -677,7 +677,7 @@ class ParticipationController extends AbstractController
$form = $this->createCreateFormMultiple($newParticipations);
return $this->render(
'ChillEventBundle:Participation:new-multiple.html.twig',
'@ChillEvent/Participation/new-multiple.html.twig',
[
'form' => $form->createView(),
'participations' => $newParticipations,
@@ -690,7 +690,7 @@ class ParticipationController extends AbstractController
$form = $this->createCreateForm($participation);
return $this->render(
'ChillEventBundle:Participation:new.html.twig',
'@ChillEvent/Participation/new.html.twig',
[
'form' => $form->createView(),
'participation' => $participation,
@@ -719,7 +719,7 @@ class ParticipationController extends AbstractController
$form = $this->createCreateForm($participation, $returnPath);
return $this->render('ChillEventBundle:Participation:new.html.twig', [
return $this->render('@ChillEvent/Participation/new.html.twig', [
'form' => $form->createView(),
'participation' => $participation,
'ignored_participations' => [], // this is required, see self::newMultiple

12
src/Bundle/ChillEventBundle/Controller/RoleController.php
View File

@@ -39,7 +39,7 @@ class RoleController extends AbstractController
return $this->redirectToRoute('chill_event_admin_role', ['id' => $entity->getId()]);
}
return $this->render('ChillEventBundle:Role:new.html.twig', [
return $this->render('@ChillEvent/Role/new.html.twig', [
'entity' => $entity,
'form' => $form->createView(),
]);
@@ -84,7 +84,7 @@ class RoleController extends AbstractController
$editForm = $this->createEditForm($entity);
$deleteForm = $this->createDeleteForm($id);
return $this->render('ChillEventBundle:Role:edit.html.twig', [
return $this->render('@ChillEvent/Role/edit.html.twig', [
'entity' => $entity,
'edit_form' => $editForm->createView(),
'delete_form' => $deleteForm->createView(),
@@ -100,7 +100,7 @@ class RoleController extends AbstractController
$entities = $em->getRepository(\Chill\EventBundle\Entity\Role::class)->findAll();
return $this->render('ChillEventBundle:Role:index.html.twig', [
return $this->render('@ChillEvent/Role/index.html.twig', [
'entities' => $entities,
]);
}
@@ -113,7 +113,7 @@ class RoleController extends AbstractController
$entity = new Role();
$form = $this->createCreateForm($entity);
return $this->render('ChillEventBundle:Role:new.html.twig', [
return $this->render('@ChillEvent/Role/new.html.twig', [
'entity' => $entity,
'form' => $form->createView(),
]);
@@ -134,7 +134,7 @@ class RoleController extends AbstractController
$deleteForm = $this->createDeleteForm($id);
return $this->render('ChillEventBundle:Role:show.html.twig', [
return $this->render('@ChillEvent/Role/show.html.twig', [
'entity' => $entity,
'delete_form' => $deleteForm->createView(),
]);
@@ -163,7 +163,7 @@ class RoleController extends AbstractController
return $this->redirectToRoute('chill_event_admin_role', ['id' => $id]);
}
return $this->render('ChillEventBundle:Role:edit.html.twig', [
return $this->render('@ChillEvent/Role/edit.html.twig', [
'entity' => $entity,
'edit_form' => $editForm->createView(),
'delete_form' => $deleteForm->createView(),

12
src/Bundle/ChillEventBundle/Controller/StatusController.php
View File

@@ -39,7 +39,7 @@ class StatusController extends AbstractController
return $this->redirectToRoute('chill_event_admin_status', ['id' => $entity->getId()]);
}
return $this->render('ChillEventBundle:Status:new.html.twig', [
return $this->render('@ChillEvent/Status/new.html.twig', [
'entity' => $entity,
'form' => $form->createView(),
]);
@@ -84,7 +84,7 @@ class StatusController extends AbstractController
$editForm = $this->createEditForm($entity);
$deleteForm = $this->createDeleteForm($id);
return $this->render('ChillEventBundle:Status:edit.html.twig', [
return $this->render('@ChillEvent/Status/edit.html.twig', [
'entity' => $entity,
'edit_form' => $editForm->createView(),
'delete_form' => $deleteForm->createView(),
@@ -100,7 +100,7 @@ class StatusController extends AbstractController
$entities = $em->getRepository(\Chill\EventBundle\Entity\Status::class)->findAll();
return $this->render('ChillEventBundle:Status:index.html.twig', [
return $this->render('@ChillEvent/Status/index.html.twig', [
'entities' => $entities,
]);
}
@@ -113,7 +113,7 @@ class StatusController extends AbstractController
$entity = new Status();
$form = $this->createCreateForm($entity);
return $this->render('ChillEventBundle:Status:new.html.twig', [
return $this->render('@ChillEvent/Status/new.html.twig', [
'entity' => $entity,
'form' => $form->createView(),
]);
@@ -134,7 +134,7 @@ class StatusController extends AbstractController
$deleteForm = $this->createDeleteForm($id);
return $this->render('ChillEventBundle:Status:show.html.twig', [
return $this->render('@ChillEvent/Status/show.html.twig', [
'entity' => $entity,
'delete_form' => $deleteForm->createView(),
]);
@@ -163,7 +163,7 @@ class StatusController extends AbstractController
return $this->redirectToRoute('chill_event_admin_status', ['id' => $id]);
}
return $this->render('ChillEventBundle:Status:edit.html.twig', [
return $this->render('@ChillEvent/Status/edit.html.twig', [
'entity' => $entity,
'edit_form' => $editForm->createView(),
'delete_form' => $deleteForm->createView(),

2
src/Bundle/ChillEventBundle/Resources/views/Event/show.html.twig
View File

@@ -2,7 +2,7 @@
{% block title 'Event : %label%'|trans({ '%label%' : event.name } ) %}
{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
{% import '@ChillPerson/Person/macro.html.twig' as person_macro %}
{% block event_content -%}
<div class="col-10">

2
src/Bundle/ChillEventBundle/Resources/views/EventType/edit.html.twig
View File

@@ -1,4 +1,4 @@
{% extends "ChillEventBundle:Admin:index.html.twig" %}
{% extends "@ChillEvent/Admin/index.html.twig" %}
{% block admin_content -%}

2
src/Bundle/ChillEventBundle/Resources/views/EventType/index.html.twig
View File

@@ -1,4 +1,4 @@
{% extends "ChillEventBundle:Admin:index.html.twig" %}
{% extends "@ChillEvent/Admin/index.html.twig" %}
{% block admin_content -%}

2
src/Bundle/ChillEventBundle/Resources/views/EventType/new.html.twig
View File

@@ -1,4 +1,4 @@
{% extends "ChillEventBundle:Admin:index.html.twig" %}
{% extends "@ChillEvent/Admin/index.html.twig" %}
{% block admin_content -%}

2
src/Bundle/ChillEventBundle/Resources/views/EventType/show.html.twig
View File

@@ -1,4 +1,4 @@
{% extends "ChillEventBundle:Admin:index.html.twig" %}
{% extends "@ChillEvent/Admin/index.html.twig" %}
{% block admin_content -%}

4
src/Bundle/ChillEventBundle/Resources/views/Participation/_ignored_participations.html.twig
View File

@@ -1,4 +1,4 @@
{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
{% import '@ChillPerson/Person/macro.html.twig' as person_macro %}
{% if ignored_participations|length > 0 %}
<p>{% transchoice ignored_participations|length %}The following people have been ignored because they are already participating on the event{% endtranschoice %}&nbsp;:</p>
@@ -7,4 +7,4 @@
<li>{{ person_macro.render(p.person) }}</li>
{% endfor %}
</ul>
{% endif %}
{% endif %}

12
src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig
View File

@@ -1,6 +1,6 @@
{% extends '@ChillEvent/layout.html.twig' %}
{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
{% import '@ChillPerson/Person/macro.html.twig' as person_macro %}
{% block event_content -%}
<div class="col-10">
@@ -18,11 +18,11 @@
</tr>
</tbody>
</table>
<h2 class="mt-5">{{ 'Participations'|trans }}</h2>
{{ form_start(form) }}
<table class="table">
<thead>
<tr>
@@ -47,7 +47,7 @@
{% endfor %}
</tbody>
</table>
<ul class="record_actions">
<li>
<a href="{{ path('chill_event__event_show', { 'event_id' : event.id } ) }}" class="btn btn-cancel">
@@ -58,7 +58,7 @@
{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-edit' } } ) }}
</li>
</ul>
{{ form_end(form) }}
</div>
{% endblock %}

6
src/Bundle/ChillEventBundle/Resources/views/Participation/edit.html.twig
View File

@@ -1,6 +1,6 @@
{% extends '@ChillEvent/layout.html.twig' %}
{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
{% import '@ChillPerson/Person/macro.html.twig' as person_macro %}
{% block event_content -%}
<div class="col-10">
@@ -22,7 +22,7 @@
</tr>
</tbody>
</table>
{{ form_start(form) }}
{{ form_row(form.role) }}
{{ form_row(form.status) }}
@@ -41,7 +41,7 @@
{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-edit' } } ) }}
</li>
</ul>
{{ form_end(form) }}
</div>
{% endblock %}

4
src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
View File

@@ -1,6 +1,6 @@
{% extends '@ChillEvent/layout.html.twig' %}
{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
{% import '@ChillPerson/Person/macro.html.twig' as person_macro %}
{% block title 'Participation creation'|trans %}
@@ -27,7 +27,7 @@
</tbody>
</table>
{% include 'ChillEventBundle:Participation:_ignored_participations.html.twig' with ignored_participations %}
{% include '@ChillEvent/Participation/_ignored_participations.html.twig' with ignored_participations %}
{{ form_start(form) }}
<table class="table">

18
src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
View File

@@ -1,6 +1,6 @@
{% extends '@ChillEvent/layout.html.twig' %}
{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
{% import '@ChillPerson/Person/macro.html.twig' as person_macro %}
{% block title 'Participation creation'|trans %}
@@ -20,17 +20,17 @@
</tr>
</tbody>
</table>
{% include 'ChillEventBundle:Participation:_ignored_participations.html.twig' with ignored_participations %}
{% include '@ChillEvent/Participation/_ignored_participations.html.twig' with ignored_participations %}
{{ form_start(form) }}
{{ form_errors(form) }}
{{ form_row(form.role) }}
{{ form_row(form.status) }}
<ul class="record_actions">
<li class="cancel">
@@ -42,7 +42,7 @@
{{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-create' } } ) }}
</li>
</ul>
{{ form_end(form) }}
</div>
{% endblock %}

2
src/Bundle/ChillEventBundle/Resources/views/Role/edit.html.twig
View File

@@ -1,4 +1,4 @@
{% extends "ChillEventBundle:Admin:index.html.twig" %}
{% extends "@ChillEvent/Admin/index.html.twig" %}
{% block admin_content -%}
<h1>{{ 'Role edit'|trans }}</h1>

2
src/Bundle/ChillEventBundle/Resources/views/Role/index.html.twig
View File

@@ -1,4 +1,4 @@
{% extends "ChillEventBundle:Admin:index.html.twig" %}
{% extends "@ChillEvent/Admin/index.html.twig" %}
{% block admin_content -%}

2
src/Bundle/ChillEventBundle/Resources/views/Role/new.html.twig
View File

@@ -1,4 +1,4 @@
{% extends "ChillEventBundle:Admin:index.html.twig" %}
{% extends "@ChillEvent/Admin/index.html.twig" %}
{% block admin_content -%}

2
src/Bundle/ChillEventBundle/Resources/views/Role/show.html.twig
View File

@@ -1,4 +1,4 @@
{% extends "ChillEventBundle:Admin:index.html.twig" %}
{% extends "@ChillEvent/Admin/index.html.twig" %}
{% block admin_content -%}

2
src/Bundle/ChillEventBundle/Resources/views/Status/edit.html.twig
View File

@@ -1,4 +1,4 @@
{% extends "ChillEventBundle:Admin:index.html.twig" %}
{% extends "@ChillEvent/Admin/index.html.twig" %}
{% block admin_content -%}

2
src/Bundle/ChillEventBundle/Resources/views/Status/index.html.twig
View File

@@ -1,4 +1,4 @@
{% extends "ChillEventBundle:Admin:index.html.twig" %}
{% extends "@ChillEvent/Admin/index.html.twig" %}
{% block admin_content -%}

2
src/Bundle/ChillEventBundle/Resources/views/Status/new.html.twig
View File

@@ -1,4 +1,4 @@
{% extends "ChillEventBundle:Admin:index.html.twig" %}
{% extends "@ChillEvent/Admin/index.html.twig" %}
{% block admin_content -%}

2
src/Bundle/ChillEventBundle/Resources/views/Status/show.html.twig
View File

@@ -1,4 +1,4 @@
{% extends "ChillEventBundle:Admin:index.html.twig" %}
{% extends "@ChillEvent/Admin/index.html.twig" %}
{% block admin_content -%}

2
src/Bundle/ChillEventBundle/Resources/views/Timeline/event_person_context.html.twig
View File

@@ -1,4 +1,4 @@
{% import 'ChillEventBundle:EventReason:macro.html.twig' as m %}
{% import '@ChillEvent/EventReason/macro.html.twig' as m %}
{% if "now"|date('U') > event.date|date('U') %}
{% set boolDate = 'past' %}

2
src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
View File

@@ -116,7 +116,7 @@ class TimelineEventProvider implements TimelineProviderInterface
$this->checkContext($context);
return [
'template' => 'ChillEventBundle:Timeline:event_person_context.html.twig',
'template' => '@ChillEvent/Timeline/event_person_context.html.twig',
'template_data' => [
'event' => $entity,
'person' => $args['person'],

3
src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
View File

@@ -578,13 +578,12 @@ class CRUDController extends AbstractController
/**
* Customize template parameters.
*
* @param mixed $entity
*
* @return array
*/
protected function generateTemplateParameter(
string $action,
$entity,
mixed $entity,
Request $request,
array $defaultTemplateParameters = []
) {

14
src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
View File

@@ -63,24 +63,24 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
/**
* the key to use to identify widget for a given place.
*/
public const WIDGET_CONFIG_ALIAS = 'widget_alias';
final public const WIDGET_CONFIG_ALIAS = 'widget_alias';
/**
* the key to use to order widget for a given place.
*/
public const WIDGET_CONFIG_ORDER = 'order';
final public const WIDGET_CONFIG_ORDER = 'order';
/**
* The service which will manage the widgets.
*
* @var string
*/
public const WIDGET_MANAGER = 'chill.main.twig.widget';
final public const WIDGET_MANAGER = 'chill.main.twig.widget';
/**
* the method wich register the widget into give service.
*/
public const WIDGET_MANAGER_METHOD_REGISTER = 'addWidget';
final public const WIDGET_MANAGER_METHOD_REGISTER = 'addWidget';
/**
* the key used to collect the alias in the service definition's tag.
@@ -89,21 +89,21 @@ abstract class AbstractWidgetsCompilerPass implements CompilerPassInterface
*
* @var string
*/
public const WIDGET_SERVICE_TAG_ALIAS = 'alias';
final public const WIDGET_SERVICE_TAG_ALIAS = 'alias';
/**
* the value of the `name` key in service definitions's tag.
*
* @var string
*/
public const WIDGET_SERVICE_TAG_NAME = 'chill_widget';
final public const WIDGET_SERVICE_TAG_NAME = 'chill_widget';
/**
* the key used to collect the authorized place in the service definition's tag.
*
* @var string
*/
public const WIDGET_SERVICE_TAG_PLACES = 'place';
final public const WIDGET_SERVICE_TAG_PLACES = 'place';
/**
* cache of ordering by place.

2
src/Bundle/ChillMainBundle/Resources/views/Notification/extension_list_notifications_for.html.twig
View File

@@ -2,7 +2,7 @@
<div class="flex-table accordion accordion-flush" id="notification-fold">
{% for notification in notifications %}
{% include 'ChillMainBundle:Notification:_list_item.html.twig' with {
{% include '@ChillMain/Notification/_list_item.html.twig' with {
'full_content': true,
'fold_item': true,
'action_button': true,

2
src/Bundle/ChillMainBundle/Resources/views/Notification/list.html.twig
View File

@@ -49,7 +49,7 @@
<div class="flex-table accordion accordion-flush" id="notification-fold">
{% for data in datas %}
{% set notification = data.notification %}
{% include 'ChillMainBundle:Notification:_list_item.html.twig' with {
{% include '@ChillMain/Notification/_list_item.html.twig' with {
'fold_item': true,
'notification_cc': data.template_data.notificationCc is defined ? data.template_data.notificationCc : false
} %}

4
src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig
View File

@@ -20,7 +20,7 @@
<h1>{{ 'notification.Notification'|trans }}</h1>
<div class="flex-table">
{% include 'ChillMainBundle:Notification:_list_item.html.twig' with {
{% include '@ChillMain/Notification/_list_item.html.twig' with {
'data': {
'template': handler.getTemplate(notification),
'template_data': handler.getTemplateData(notification)
@@ -32,7 +32,7 @@
} %}
</div>
{% include 'ChillMainBundle:Notification:_item_comments.html.twig' %}
{% include '@ChillMain/Notification/_item_comments.html.twig' %}
<ul class="record_actions sticky-form-buttons">
<li class="cancel">

2
src/Bundle/ChillMainBundle/Resources/views/User/edit_current_location.html.twig
View File

@@ -1,4 +1,4 @@
{% extends 'ChillMainBundle::layout.html.twig' %}
{% extends '@ChillMain/layout.html.twig' %}
{% block title %}{{ 'Edit my current location'|trans }}{% endblock %}

2
src/Bundle/ChillMainBundle/Resources/views/Workflow/list.html.twig
View File

@@ -1,4 +1,4 @@
{% extends 'ChillMainBundle::layout.html.twig' %}
{% extends '@ChillMain/layout.html.twig' %}
{% import '@ChillMain/Workflow/macro_breadcrumb.html.twig' as macro %}

2
src/Bundle/ChillMainBundle/Routing/MenuTwig.php
View File

@@ -44,7 +44,7 @@ class MenuTwig extends AbstractExtension implements ContainerAwareInterface
*
* Expected params :
* - args: the arguments to build the path (i.e: if pattern is /something/{bar}, args must contain {'bar': 'foo'}
* - layout: the layout. Absolute path needed (i.e.: ChillXyzBundle:section:foo.html.twig)
* - layout: the layout. Absolute path needed (i.e.: @ChillXyz/section/foo.html.twig)
* - activeRouteKey : the key active, will render the menu differently.
*
* @deprecated link: see https://redmine.champs-libres.coop/issues/179 for more informations

2
src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php
View File

@@ -92,7 +92,7 @@ interface TimelineProviderInterface
*
* ```
* array(
* 'template' => 'ChillMyBundle:timeline:template.html.twig',
* 'template' => '@ChillMy/timeline/template.html.twig',
* 'template_data' => array(
* 'accompanyingPeriod' => $entity,
* 'person' => $args['person']

10
src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
View File

@@ -127,7 +127,7 @@ class AccompanyingPeriodController extends AbstractController
}
}
return $this->render('ChillPersonBundle:AccompanyingPeriod:form.html.twig', [
return $this->render('@ChillPerson/AccompanyingPeriod/form.html.twig', [
'form' => $form->createView(),
'person' => $person,
'accompanying_period' => $current,
@@ -190,7 +190,7 @@ class AccompanyingPeriodController extends AbstractController
}
}
return $this->render('ChillPersonBundle:AccompanyingPeriod:form.html.twig', [
return $this->render('@ChillPerson/AccompanyingPeriod/form.html.twig', [
'form' => $form->createView(),
'person' => $person,
'accompanying_period' => $accompanyingPeriod,
@@ -299,7 +299,7 @@ class AccompanyingPeriodController extends AbstractController
}
}
return $this->render('ChillPersonBundle:AccompanyingPeriod:form.html.twig', [
return $this->render('@ChillPerson/AccompanyingPeriod/form.html.twig', [
'form' => $form->createView(),
'person' => $person,
'accompanying_period' => $accompanyingPeriod,
@@ -340,7 +340,7 @@ class AccompanyingPeriodController extends AbstractController
}
if (false === $confirm && $period->canBeReOpened($person)) {
return $this->render('ChillPersonBundle:AccompanyingPeriod:re_open.html.twig', [
return $this->render('@ChillPerson/AccompanyingPeriod/re_open.html.twig', [
'period' => $period,
'person' => $person,
]);
@@ -417,7 +417,7 @@ class AccompanyingPeriodController extends AbstractController
}
}
return $this->render('ChillPersonBundle:AccompanyingPeriod:form.html.twig', [
return $this->render('@ChillPerson/AccompanyingPeriod/form.html.twig', [
'form' => $form->createView(),
'person' => $person,
'accompanying_period' => $accompanyingPeriod,

8
src/Bundle/ChillPersonBundle/Controller/AdminController.php
View File

@@ -24,7 +24,7 @@ class AdminController extends AbstractController
*/
public function indexAccompanyingCourseAdminAction()
{
return $this->render('ChillPersonBundle:Admin:indexAccompanyingCourse.html.twig');
return $this->render('@ChillPerson/Admin/indexAccompanyingCourse.html.twig');
}
/**
@@ -32,7 +32,7 @@ class AdminController extends AbstractController
*/
public function indexHouseholdAdminAction()
{
return $this->render('ChillPersonBundle:Admin:indexHousehold.html.twig');
return $this->render('@ChillPerson/Admin/indexHousehold.html.twig');
}
/**
@@ -40,7 +40,7 @@ class AdminController extends AbstractController
*/
public function indexPersonAdminAction()
{
return $this->render('ChillPersonBundle:Admin:indexPerson.html.twig');
return $this->render('@ChillPerson/Admin/indexPerson.html.twig');
}
/**
@@ -48,7 +48,7 @@ class AdminController extends AbstractController
*/
public function indexSocialWorkAdminAction()
{
return $this->render('ChillPersonBundle:Admin:indexSocialWork.html.twig');
return $this->render('@ChillPerson/Admin/indexSocialWork.html.twig');
}
/**

2
src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
View File

@@ -80,7 +80,7 @@ class HouseholdCompositionController extends AbstractController
}
return $this->render(
'ChillPersonBundle:HouseholdComposition:delete.html.twig',
'@ChillPerson/HouseholdComposition/delete.html.twig',
[
'household' => $household,
'composition' => $composition,

10
src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
View File

@@ -89,7 +89,7 @@ class PersonAddressController extends AbstractController
}
}
return $this->render('ChillPersonBundle:Address:new.html.twig', [
return $this->render('@ChillPerson/Address/new.html.twig', [
'person' => $person,
'form' => $form->createView(),
]);
@@ -116,7 +116,7 @@ class PersonAddressController extends AbstractController
$form = $this->createEditForm($person, $address);
return $this->render('ChillPersonBundle:Address:edit.html.twig', [
return $this->render('@ChillPerson/Address/edit.html.twig', [
'person' => $person,
'address' => $address,
'form' => $form->createView(),
@@ -140,7 +140,7 @@ class PersonAddressController extends AbstractController
'You are not allowed to edit this person.'
);
return $this->render('ChillPersonBundle:Address:list.html.twig', [
return $this->render('@ChillPerson/Address/list.html.twig', [
'person' => $person,
]);
}
@@ -166,7 +166,7 @@ class PersonAddressController extends AbstractController
$form = $this->createCreateForm($person, $address);
return $this->render('ChillPersonBundle:Address:new.html.twig', [
return $this->render('@ChillPerson/Address/new.html.twig', [
'person' => $person,
'form' => $form->createView(),
]);
@@ -218,7 +218,7 @@ class PersonAddressController extends AbstractController
}
}
return $this->render('ChillPersonBundle:Address:edit.html.twig', [
return $this->render('@ChillPerson/Address/edit.html.twig', [
'person' => $person,
'address' => $address,
'form' => $form->createView(),

4
src/Bundle/ChillPersonBundle/Controller/PersonController.php
View File

@@ -107,7 +107,7 @@ final class PersonController extends AbstractController
}
return $this->render(
'ChillPersonBundle:Person:edit.html.twig',
'@ChillPerson/Person/edit.html.twig',
['person' => $person, 'form' => $form->createView()]
);
}
@@ -275,7 +275,7 @@ final class PersonController extends AbstractController
$this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
return $this->render(
'ChillPersonBundle:Person:view.html.twig',
'@ChillPerson/Person/view.html.twig',
[
'person' => $person,
'cFGroup' => $this->getCFGroup(),

6
src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
View File

@@ -92,7 +92,7 @@ class PersonDuplicateController extends \Symfony\Bundle\FrameworkBundle\Controll
return $this->redirectToRoute('chill_person_duplicate_view', ['person_id' => $person1->getId()]);
}
return $this->render('ChillPersonBundle:PersonDuplicate:confirm.html.twig', [
return $this->render('@ChillPerson/PersonDuplicate/confirm.html.twig', [
'person' => $person1,
'person2' => $person2,
'form' => $form->createView(),
@@ -143,7 +143,7 @@ class PersonDuplicateController extends \Symfony\Bundle\FrameworkBundle\Controll
return $this->redirectToRoute('chill_person_duplicate_confirm', $params);
}
return $this->render('ChillPersonBundle:PersonDuplicate:find_manually.html.twig', [
return $this->render('@ChillPerson/PersonDuplicate/find_manually.html.twig', [
'person' => $person,
'form' => $form->createView(),
]);
@@ -216,7 +216,7 @@ class PersonDuplicateController extends \Symfony\Bundle\FrameworkBundle\Controll
$notDuplicatePersons = $personNotDuplicateRepository->findNotDuplicatePerson($person);
return $this->render('ChillPersonBundle:PersonDuplicate:view.html.twig', [
return $this->render('@ChillPerson/PersonDuplicate/view.html.twig', [
'person' => $person,
'duplicatePersons' => $duplicatePersons,
'notDuplicatePersons' => $notDuplicatePersons,

8
src/Bundle/ChillPersonBundle/Controller/PersonResourceController.php
View File

@@ -66,7 +66,7 @@ final class PersonResourceController extends AbstractController
}
return $this->render(
'ChillPersonBundle:PersonResource:delete.html.twig',
'@ChillPerson/PersonResource/delete.html.twig',
[
'person' => $personOwner,
'resource' => $resource,
@@ -99,7 +99,7 @@ final class PersonResourceController extends AbstractController
}
return $this->render(
'ChillPersonBundle:PersonResource:edit.html.twig',
'@ChillPerson/PersonResource/edit.html.twig',
[
'person' => $personOwner,
'resource' => $resource,
@@ -118,7 +118,7 @@ final class PersonResourceController extends AbstractController
$personResources = $this->personResourceRepository->findBy(['personOwner' => $personOwner->getId()]);
return $this->render(
'ChillPersonBundle:PersonResource:list.html.twig',
'@ChillPerson/PersonResource/list.html.twig',
[
'person' => $personOwner,
'personResources' => $personResources,
@@ -148,7 +148,7 @@ final class PersonResourceController extends AbstractController
}
return $this->render(
'ChillPersonBundle:PersonResource:create.html.twig',
'@ChillPerson/PersonResource/create.html.twig',
[
'form' => $form->createView(),
'person' => $personOwner,

2
src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php
View File

@@ -49,7 +49,7 @@ class TimelinePersonController extends AbstractController
$this->eventDispatcher->dispatch($event, PrivacyEvent::PERSON_PRIVACY_EVENT);
return $this->render(
'ChillPersonBundle:Timeline:index.html.twig',
'@ChillPerson/Timeline/index.html.twig',
[
'timeline' => $this->timelineBuilder->getTimelineHTML(
'person',

3
src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPersonACL.php
View File

@@ -40,8 +40,6 @@ class LoadPersonACL extends AbstractFixture implements OrderedFixtureInterface
switch ($permissionsGroup->getName()) {
case 'social':
case 'direction':
printf("Adding CHILL_PERSON_UPDATE & CHILL_PERSON_CREATE to %s permission group \n", $permissionsGroup->getName());
$permissionsGroup->addRoleScope(
(new RoleScope())
->setRole(AccompanyingPeriodVoter::FULL)
@@ -80,7 +78,6 @@ class LoadPersonACL extends AbstractFixture implements OrderedFixtureInterface
break;
case 'administrative':
printf("Adding CHILL_PERSON_SEE to %s permission group \n", $permissionsGroup->getName());
$roleScopeSee = (new RoleScope())
->setRole('CHILL_PERSON_SEE')
->setScope(null);

2
src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/dispatch_list.html.twig
View File

@@ -1,4 +1,4 @@
{% extends 'ChillMainBundle::layout.html.twig' %}
{% extends '@ChillMain/layout.html.twig' %}
{% block title "Liste de parcours à répartir" %}

2
src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
View File

@@ -258,7 +258,7 @@
{% endif %}
<h2 class="mb-3 visually-hidden">{{ 'Last activities' |trans }}</h2>
{% include 'ChillActivityBundle:Activity:list_recent.html.twig' with { 'context': 'accompanyingCourse', 'no_action': true } %}
{% include '@ChillActivity/Activity/list_recent.html.twig' with { 'context': 'accompanyingCourse', 'no_action': true } %}
</div>
{% endblock %}

4
src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/_list.html.twig
View File

@@ -63,7 +63,7 @@
<div class="flex-table accompanyingcourse-list">
{% for period in acps %}
{% include 'ChillPersonBundle:AccompanyingPeriod:_list_item.html.twig' with {
{% include '@ChillPerson/AccompanyingPeriod/_list_item.html.twig' with {
'recordAction': _self.recordAction(period, contextEntity)
} %}
{% else %}
@@ -100,7 +100,7 @@
<div class="flex-table accompanyingcourse-list">
{% for period in acpsClosed %}
{% include 'ChillPersonBundle:AccompanyingPeriod:_list_item.html.twig' with {
{% include '@ChillPerson/AccompanyingPeriod/_list_item.html.twig' with {
'recordAction': _self.recordAction(period, contextEntity)
} %}
{% endfor %}

2
src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
View File

@@ -9,7 +9,7 @@
<h1>{{ 'Accompanying period list'|trans }}</h1>
{% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
{% include '@ChillPerson/AccompanyingPeriod/_list.html.twig' %}
<ul class="record_actions sticky-form-buttons">
<li class="cancel">

2
src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/reassign_list.html.twig
View File

@@ -1,4 +1,4 @@
{% extends 'ChillMainBundle::layout.html.twig' %}
{% extends '@ChillMain/layout.html.twig' %}
{% block title 'period_by_user_list.Period by user'|trans %}

4
src/Bundle/ChillPersonBundle/Resources/views/Household/accompanying_period.html.twig
View File

@@ -7,7 +7,7 @@
<h1>{{ block('title') }}</h1>
{% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' %}
{% include '@ChillPerson/AccompanyingPeriod/_list.html.twig' %}
{% if accompanying_periods_old|length > 0 %}
<div class="accordion" id="nonCurrent">
@@ -28,7 +28,7 @@
class="accordion-collapse collapse"
aria-labelledby="heading_{{ household.id }}"
data-bs-parent="#nonCurrent">
{% include 'ChillPersonBundle:AccompanyingPeriod:_list.html.twig' with {'accompanying_periods' : accompanying_periods_old} %}
{% include '@ChillPerson/AccompanyingPeriod/_list.html.twig' with {'accompanying_periods' : accompanying_periods_old} %}
</div>
</div>
</div>

2
src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
View File

@@ -28,7 +28,7 @@ This view should receive those arguments:
we define variables to include an edit form repeated multiple time across
the page
#}
{% set edit_tmp_name = 'ChillPersonBundle:Form:go_to_form.html.twig' %}
{% set edit_tmp_name = '@ChillPerson/Form/go_to_form.html.twig' %}
{% set edit_tmp_args = { 'form_path_args' : { 'person_id': person.id },
'form_path_key' : 'chill_person_general_edit' } %}

4
src/Bundle/ChillPersonBundle/Resources/views/Widget/homepage_person_list.html.twig
View File

@@ -1,8 +1,8 @@
{#
{#
if the `custom_fields` option is used, the custom fields are available
under the customFields variable, with the custom field slug as key.
#}
{% import 'ChillPersonBundle:Person:macro.html.twig' as person %}
{% import '@ChillPerson/Person/macro.html.twig' as person %}
<div class="col-8 centered">
<h2>{{ 'Accompanyied people'|trans }}</h2>
<table>

4
src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php
View File

@@ -54,8 +54,8 @@ final class AccompanyingCourseControllerTest extends WebTestCase
->findOneBy(['name' => 'Center A']);
$personIds = $em->createQuery('SELECT p.id FROM ' .
Person::class . ' p ' .
' WHERE p.center = :center')
Person::class . ' p JOIN p.centerCurrent cc ' .
' WHERE cc.center = :center')
->setParameter('center', $center)
->setMaxResults(100)
->getScalarResult();

1
src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php
View File

@@ -56,6 +56,7 @@ final class PersonDuplicateControllerViewTest extends WebTestCase
$crawler = $client->request('GET', '/en/person/' . $this->person->getId() . '/duplicate/view');
$response = $client->getResponse();
var_dump(substr($crawler->html(), 0, 500));
$this->assertTrue($response->isSuccessful());
$this->assertGreaterThan(0, $crawler->filter('html:contains("Find duplicate")')->count());

2
src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php
View File

@@ -36,7 +36,7 @@ class TimelineAccompanyingPeriodClosing extends AbstractTimelineAccompanyingPeri
public function getEntityTemplate($entity, $context, array $args)
{
return $this->getBasicEntityTemplate(
'ChillPersonBundle:Timeline:closing_period.html.twig',
'@ChillPerson/Timeline/closing_period.html.twig',
$entity,
$context,
$args

2
src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php
View File

@@ -34,7 +34,7 @@ class TimelineAccompanyingPeriodOpening extends AbstractTimelineAccompanyingPeri
public function getEntityTemplate($entity, $context, array $args)
{
return $this->getBasicEntityTemplate(
'ChillPersonBundle:Timeline:opening_period.html.twig',
'@ChillPerson/Timeline/opening_period.html.twig',
$entity,
$context,
$args

2
src/Bundle/ChillPersonBundle/Widget/AddAPersonWidget.php
View File

@@ -25,6 +25,6 @@ class AddAPersonWidget implements WidgetInterface
array $context,
array $config
) {
return $env->render('ChillPersonBundle:Widget:homepage_add_a_person.html.twig');
return $env->render('@ChillPerson/Widget/homepage_add_a_person.html.twig');
}
}

Some files were not shown because too many files have changed in this diff Show More