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

Get logs from deleted records as well

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-11-21 09:24:44 +01:00
parent e2267d4f1c
commit 31938f23c7
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/classes/module/report/activity.php
View File

@@ -294,7 +294,7 @@ class module_report_activity extends module_report
AND (log_docs.action = 'download' OR log_docs.action = 'mail')
AND (log_docs.final = 'preview' OR log_docs.final = 'document')
) AS tt
INNER JOIN record ON (record.record_id = tt.record_id)
LEFT JOIN record ON (record.record_id = tt.record_id)
LEFT JOIN subdef AS s ON (s.record_id = tt.record_id)
WHERE s.name = tt.final
GROUP BY tt.final, ddate
@@ -480,7 +480,7 @@ class module_report_activity extends module_report
WHERE (" . $filter['sql'] . ") AND !ISNULL(usrid)
AND (log_docs.action = 'download' OR log_docs.action = 'mail')
) AS tt
INNER JOIN record ON (record.record_id = tt.record_id)
LEFT JOIN record ON (record.record_id = tt.record_id)
LEFT JOIN subdef FORCE INDEX (unicite) ON (tt.record_id = subdef.record_id)
WHERE subdef.name = tt.final
GROUP BY " . $on . ", usrid