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

fix error: the "see more" link was not showed

Browse Source
This commit is contained in:
Julien Fastré 2018-11-20 21:38:03 +01:00
parent f4331f1756
commit 176ca90e39
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -12,3 +12,8 @@ Version 1.5.4
- adding indexes on place event and task - adding indexes on place event and task
Branche de développement
========================
- Fix error on the "see more" link which was not showed

2
Controller/SingleTaskController.php
View File

@ -389,7 +389,7 @@ class SingleTaskController extends Controller
$params['person'] = $person; $params['person'] = $person;
} elseif (!empty($request->query->get('center_id', NULL))) { } elseif (!empty($request->query->get('center_id', NULL))) {
$center = $centerRepository->find($request->query->getInt('center_id')); $center = $centerRepository->find($request->query->getInt('center_id'));
dump($center);
if ($center === null) { if ($center === null) {
throw $this->createNotFoundException('center not found'); throw $this->createNotFoundException('center not found');
} }

23
Resources/views/SingleTask/_list.html.twig
View File

@ -6,7 +6,6 @@
<thead> <thead>
<tr> <tr>
<th class="chill-red">{{ 'Title'|trans }}</th> <th class="chill-red">{{ 'Title'|trans }}</th>
<th class="chill-green">{{ 'Task type'|trans }}</th>
{% if person is null %} {% if person is null %}
<th>{{ 'Person'|trans }}</th> <th>{{ 'Person'|trans }}</th>
{% endif %} {% endif %}
@ -17,8 +16,14 @@
<tbody> <tbody>
{% for task in tasks %} {% for task in tasks %}
<tr> <tr>
<td>{{ task.title }}</td> <td>
<td>{{ task_workflow_metadata(task, 'definition.name')|trans }}</td>
<p><strong>{{ task.title }}</strong></p>
<dl>
<dt>{{ 'Task type'|trans }}</dt>
<dd>{{ task_workflow_metadata(task, 'definition.name')|trans }}</dd>
</dl>
</td>
{% if person is null %} {% if person is null %}
<td><a href="{{ path('chill_person_view', {person_id : task.person.Id}) }}">{{ task.person}}</a></td> <td><a href="{{ path('chill_person_view', {person_id : task.person.Id}) }}">{{ task.person}}</a></td>
{% endif %} {% endif %}
@ -92,7 +97,6 @@
</tbody> </tbody>
</table> </table>
{% if isSingleStatus %} {% if isSingleStatus %}
{% if tasks|length < paginator.getTotalItems %} {% if tasks|length < paginator.getTotalItems %}
{{ chill_pagination(paginator) }} {{ chill_pagination(paginator) }}
@ -128,16 +132,9 @@
{% else %} {% else %}
<ul class="record_actions"> <ul class="record_actions">
<li> <li>
{% if person is not null %} <a href="{{ path('chill_task_singletask_list', app.request.query.all|merge({ 'status': [ status ] })) }}" class="sc-button">
<a href="{{ path('chill_task_singletask_list', {'person_id': person.id, 'status' : [ status ] }) }}" class="sc-button">
{{ 'See more' | trans }} {{ 'See more' | trans }}
</a> </a>
{% endif %}
{% if user is not null %}
<a href="{{ path('chill_task_singletask_list', {'status' : [ status ] }) }}" class="sc-button">
{{ 'See more' | trans }}
</a>
{% endif %}
</li> </li>
</ul> </ul>
@ -212,7 +209,7 @@
</li> </li>
</ul> </ul>
{% endif %} {% endif %}
{% if single_task_ended_tasks is defined %} {% if single_task_ended_tasks is defined %}
{{ helper.date_status('Tasks with expired deadline', single_task_ended_tasks, single_task_ended_count, single_task_ended_paginator, 'ended', isSingleStatus, person) }} {{ helper.date_status('Tasks with expired deadline', single_task_ended_tasks, single_task_ended_count, single_task_ended_paginator, 'ended', isSingleStatus, person) }}
{% endif %} {% endif %}