hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into PHRAS-3096_prod-uploa-remove-flash-uploader

Browse Source
This commit is contained in:
Nicolas Maillat
2020-05-27 17:20:59 +02:00
committed by GitHub
parent 14869907db c5f90e930e
commit 84d6792436
35 changed files with 2706 additions and 2038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
templates/web/admin/worker-manager/worker_info.html.twig
View File

@@ -46,8 +46,9 @@
<th class="sortable">{{ 'admin::workermanager:tab:workerinfo: record_id' | trans }}</th>
<th class="sortable">{{ 'admin::workermanager:tab:workerinfo: work' | trans }}</th>
<th class="sortable">{{ 'admin::workermanager:tab:workerinfo: work_on' | trans }}</th>
<th class="sortable">{{ 'admin::workermanager:tab:workerinfo: created' | trans }}</th>
<th class="sortable">{{ 'admin::workermanager:tab:workerinfo: published' | trans }}</th>
<th class="sortable">{{ 'admin::workermanager:tab:workerinfo: created' | trans }}</th>
<th class="sortable">{{ 'admin::workermanager:tab:workerinfo: finished' | trans }}</th>
<th class="sortable">{{ 'admin::workermanager:tab:workerinfo: status' | trans }}</th>
</tr>
</thead>
@@ -60,8 +61,16 @@
<td>{{ workerRow.recordId }}</td>
<td>{{ workerRow.getWorkName }}</td>
<td>{{ workerRow.workOn }}</td>
<td>{{ workerRow.created|date('Y-m-d H:i:s') }}</td>
<td>{{ workerRow.published|date('Y-m-d H:i:s') }}</td>
<td>{{ workerRow.created|date('Y-m-d H:i:s') }}</td>
<td>
{% if workerRow.finished %}
{{ workerRow.finished|date('Y-m-d H:i:s') }}
{% else %}
-
{% endif %}
</td>
<td>{{ workerRow.status }}</td>
</tr>
{% endfor %}
@@ -72,7 +81,6 @@
<script type="text/javascript">
$("#refresh-list").on('click', function () {
console.log("ato");
var running = 1;
var finished = 1;
if (!$(".running-work").is(":checked"))

2
templates/web/admin/worker-manager/worker_searchengine.html.twig
View File

@@ -86,7 +86,7 @@
}
});
} else {
alert({{ "admin::workermanager:tab:searchengine: Warning Worker is in process to indexing one of the selected databox" |trans }});
alert('{{ "admin::workermanager:tab:searchengine: Warning Worker is in process to indexing one of the selected databox" |trans }}');
}
}
});