hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 22:43:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-4033 fix timeline history for writemetadata and subdefinition (#4491)

Browse Source 
* fix timeline historic for writemetadata and subdefinition

* fix alter table in log_docs
This commit is contained in:
Aina Sitraka
2024-03-25 21:23:06 +03:00
committed by GitHub
parent d8d8c714e4
commit 28bb3630b4
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/classes/Session/Logger.php
View File

@@ -295,7 +295,8 @@ class Session_Logger
$comment = json_encode([ $comment = json_encode([
'finished' => empty($finished) ? '' : $finished->format('Y-m-d H:i:s'), 'finished' => empty($finished) ? '' : $finished->format('Y-m-d H:i:s'),
'duration' => empty($finished) ? '' : $finished->getTimestamp() - $workerRunningJob->getCreated()->getTimestamp() , 'duration' => empty($finished) ? '' : $finished->getTimestamp() - $workerRunningJob->getCreated()->getTimestamp() ,
'status' => $status 'status' => $status,
'subdefName' => $subdefName
]); ]);
if ($count > 0) { if ($count > 0) {

2
lib/conf.d/bases_structure.xml
View File

@@ -2580,7 +2580,7 @@
</field> </field>
<field> <field>
<name>action</name> <name>action</name>
<type>enum('push','add','validate','edit','collection','status','print','substit','publish','download','mail','ftp','delete', 'subdefCreation', 'writeMetadatas', '')</type> <type>enum('push','add','validate','edit','collection','status','print','substit','publish','download','mail','ftp','delete','subdefCreation','writeMetadatas','')</type>
<null></null> <null></null>
<extra></extra> <extra></extra>
<default></default> <default></default>

24
templates/web/prod/preview/short_history.html.twig
View File

@@ -43,11 +43,27 @@
{% set content = done['final']|join(', ') %} {% set content = done['final']|join(', ') %}
{% trans with {'%dest%' : dest, '%content%' : content} %}Envoi par ftp a %dest% de %content%{% endtrans %} {% trans with {'%dest%' : dest, '%content%' : content} %}Envoi par ftp a %dest% de %content%{% endtrans %}
{% elseif action == 'subdefCreation' %} {% elseif action == 'subdefCreation' %}
{% set comment = done['comment'] | join(', ') | json_to_array %} {% for k, comment in done['comment'] %}
{% trans with {'%subdefName%' : done['final'] | join(', '), '%started%' : hour, '%duration%' : (comment.duration == '') ? '-' : comment.duration | date_duration , '%status%' : comment.status} %}create subdefinition: %subdefName% start at %started% during %duration% -- status %status%{% endtrans %} {% set comment = comment | json_to_array %}
{% set subdefName = comment.subdefName is defined ? comment.subdefName : done['final'][k] %}
{% trans with {'%subdefName%' : subdefName, '%started%' : hour, '%duration%' : (comment.duration == '') ? '-' : comment.duration | date_duration , '%status%' : comment.status} %}create subdefinition: %subdefName% start at %started% during %duration% -- status %status%{% endtrans %}
{% if done['final']|length > 1 %}
{# separate with line break #}
<br><br>
{% endif %}
{% endfor %}
{% elseif action == 'writeMetadatas' %} {% elseif action == 'writeMetadatas' %}
{% set comment = done['comment'] | join(', ') | json_to_array %} {% for k, comment in done['comment'] %}
{% trans with {'%subdefName%' : done['final'] | join(', '), '%started%' : hour, '%duration%' : (comment.duration == '') ? '-' : comment.duration | date_duration , '%status%' : comment.status} %}write metadatas: %subdefName% start at %started% during %duration% -- status %status%{% endtrans %} {% set comment = comment | json_to_array %}
{% set subdefName = comment.subdefName is defined ? comment.subdefName : done['final'][k] %}
{% trans with {'%subdefName%' : subdefName, '%started%' : hour, '%duration%' : (comment.duration == '') ? '-' : comment.duration | date_duration , '%status%' : comment.status} %}write metadatas: %subdefName% start at %started% during %duration% -- status %status%{% endtrans %}
{% endfor %}
{% if done['final']|length > 1 %}
{# separate with line break #}
<br><br>
{% endif %}
{% elseif action == 'delete' %} {% elseif action == 'delete' %}
{{ 'report::supression du document' | trans }} {{ 'report::supression du document' | trans }}
{% elseif action == 'add' %} {% elseif action == 'add' %}