mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-08-20 22:53:49 +00:00
rename 'label' to 'name'.
Warning : this commit require to rename some table column, but the original Version file has been update. If you do not care to loose your date, you may run : ``` php app/console doctrine:migrations:execute --down 20160318111334 php app/console doctrine:migrations:execute --up 20160318111334 php app/console doctrine:cache:metadata #(if you have a cache for doctrine meta date) ``` close #20
This commit is contained in:
@@ -11,7 +11,7 @@
|
||||
{% if edit_form.center is defined %}
|
||||
{{ form_row(edit_form.center) }}
|
||||
{% endif %}
|
||||
{{ form_row(edit_form.label) }}
|
||||
{{ form_row(edit_form.name) }}
|
||||
{{ form_row(edit_form.date) }}
|
||||
{{ form_row(edit_form.type, { 'label': 'Event type' }) }}
|
||||
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Id</th>
|
||||
<th>Label</th>
|
||||
<th>Name</th>
|
||||
<th>Date</th>
|
||||
<th>Actions</th>
|
||||
</tr>
|
||||
@@ -16,7 +16,7 @@
|
||||
{% for entity in entities %}
|
||||
<tr>
|
||||
<td><a href="{{ path('chill_event__event_show', { 'id': entity.id }) }}">{{ entity.id }}</a></td>
|
||||
<td>{{ entity.label }}</td>
|
||||
<td>{{ entity.name }}</td>
|
||||
<td>{% if entity.date %}{{ entity.date|date('Y-m-d H:i:s') }}{% endif %}</td>
|
||||
<td>
|
||||
<ul>
|
||||
|
@@ -16,9 +16,9 @@
|
||||
<tbody>
|
||||
{% for event in events %}
|
||||
<tr>
|
||||
<td>{{ event.label }}</td>
|
||||
<td>{{ event.name }}</td>
|
||||
<td>{{ event.date|localizeddate('long', 'none') }}</td>
|
||||
<td>{{ event.type.label|localize_translatable_string }}</td>
|
||||
<td>{{ event.type.name|localize_translatable_string }}</td>
|
||||
<td>
|
||||
<ul class="record_actions">
|
||||
<li>
|
||||
|
@@ -9,7 +9,7 @@
|
||||
{{ form_errors(form) }}
|
||||
{{ form_row(form.circle) }}
|
||||
{{ form_row(form.center) }}
|
||||
{{ form_row(form.label) }}
|
||||
{{ form_row(form.name) }}
|
||||
{{ form_row(form.date) }}
|
||||
{{ form_row(form.type, { 'label': 'Event type' }) }}
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{% extends 'ChillEventBundle::layout.html.twig' %}
|
||||
|
||||
{% block title 'Event : %label%'|trans({ '%label%' : event.label } ) %}
|
||||
{% block title 'Event : %label%'|trans({ '%label%' : event.name } ) %}
|
||||
|
||||
{% import 'ChillPersonBundle:Person:macro.html.twig' as person_macro %}
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<tbody>
|
||||
<tr>
|
||||
<th>{{ 'Name'|trans }}</th>
|
||||
<td>{{ event.label }}</td>
|
||||
<td>{{ event.name }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>{{ 'Date'|trans }}</th>
|
||||
@@ -19,7 +19,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<th>{{ 'Event type'|trans }}</th>
|
||||
<td>{{ event.type.label|localize_translatable_string }}</td>
|
||||
<td>{{ event.type.name|localize_translatable_string }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>{{ 'Circle'|trans }}</th>
|
||||
@@ -55,9 +55,9 @@
|
||||
{% for participation in event.participations %}
|
||||
<tr>
|
||||
<td>{{ person_macro.render(participation.person) }}</td>
|
||||
<td>{{ participation.role.label|localize_translatable_string }}</td>
|
||||
<td>{{ participation.status.label|localize_translatable_string }}</td>
|
||||
<td>{{ participation.lastUpdate|time_diff }} <i class="fa fa-calendar-o" title="{{ participation.lastUpdate|localizeddate("long", "medium")|escape('html_attr') }}"></i></td>
|
||||
<td>{{ participation.role.name|localize_translatable_string }}</td>
|
||||
<td>{{ participation.status.name|localize_translatable_string }}</td>
|
||||
<td>{{ participation.lastUpdate|time_diff }} <i class="fa fa-info-circle" title="{{ participation.lastUpdate|localizeddate("long", "medium")|escape('html_attr') }}"></i></td>
|
||||
<td>
|
||||
<ul class="record_actions">
|
||||
{% if is_granted('CHILL_EVENT_PARTICIPATION_UPDATE', participation) %}
|
||||
|
@@ -16,7 +16,7 @@
|
||||
{% for entity in entities %}
|
||||
<tr>
|
||||
<td><a href="{{ path('{_locale}_admin_show', { 'id': entity.id }) }}">{{ entity.id }}</a></td>
|
||||
<td>{{ entity.label }}</td>
|
||||
<td>{{ entity.name }}</td>
|
||||
<td>{{ entity.active }}</td>
|
||||
<td>
|
||||
<ul>
|
||||
|
@@ -10,8 +10,8 @@
|
||||
<td>{{ entity.id }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Label</th>
|
||||
<td>{{ entity.label }}</td>
|
||||
<th>Name</th>
|
||||
<td>{{ entity.name }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Active</th>
|
||||
|
@@ -13,7 +13,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<th>{{ 'Associated event'|trans }} </th>
|
||||
<td>{{ participation.event.label }}</td>
|
||||
<td>{{ participation.event.name }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>{{ 'Date'|trans }} </th>
|
||||
|
@@ -15,7 +15,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<th>{{ 'Associated event'|trans }} </th>
|
||||
<td>{{ participation.event.label }}</td>
|
||||
<td>{{ participation.event.name }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Id</th>
|
||||
<th>Label</th>
|
||||
<th>Name</th>
|
||||
<th>Active</th>
|
||||
<th>Actions</th>
|
||||
</tr>
|
||||
@@ -16,7 +16,7 @@
|
||||
{% for entity in entities %}
|
||||
<tr>
|
||||
<td><a href="{{ path('{_locale}_admin_role_show', { 'id': entity.id }) }}">{{ entity.id }}</a></td>
|
||||
<td>{{ entity.label }}</td>
|
||||
<td>{{ entity.name }}</td>
|
||||
<td>{{ entity.active }}</td>
|
||||
<td>
|
||||
<ul>
|
||||
|
@@ -10,8 +10,8 @@
|
||||
<td>{{ entity.id }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Label</th>
|
||||
<td>{{ entity.label }}</td>
|
||||
<th>Name</th>
|
||||
<td>{{ entity.name }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Active</th>
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Id</th>
|
||||
<th>Label</th>
|
||||
<th>Name</th>
|
||||
<th>Active</th>
|
||||
<th>Actions</th>
|
||||
</tr>
|
||||
@@ -16,7 +16,7 @@
|
||||
{% for entity in entities %}
|
||||
<tr>
|
||||
<td><a href="{{ path('fr_admin_event_status_show', { 'id': entity.id }) }}">{{ entity.id }}</a></td>
|
||||
<td>{{ entity.label }}</td>
|
||||
<td>{{ entity.name }}</td>
|
||||
<td>{{ entity.active }}</td>
|
||||
<td>
|
||||
<ul>
|
||||
|
@@ -10,8 +10,8 @@
|
||||
<td>{{ entity.id }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Label</th>
|
||||
<td>{{ entity.label }}</td>
|
||||
<th>Name</th>
|
||||
<td>{{ entity.name }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Active</th>
|
||||
|
Reference in New Issue
Block a user