hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 20:43:25 +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.action = 'download' OR log_docs.action = 'mail')
AND (log_docs.final = 'preview' OR log_docs.final = 'document') AND (log_docs.final = 'preview' OR log_docs.final = 'document')
) AS tt ) 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) LEFT JOIN subdef AS s ON (s.record_id = tt.record_id)
WHERE s.name = tt.final WHERE s.name = tt.final
GROUP BY tt.final, ddate GROUP BY tt.final, ddate
@@ -480,7 +480,7 @@ class module_report_activity extends module_report
WHERE (" . $filter['sql'] . ") AND !ISNULL(usrid) WHERE (" . $filter['sql'] . ") AND !ISNULL(usrid)
AND (log_docs.action = 'download' OR log_docs.action = 'mail') AND (log_docs.action = 'download' OR log_docs.action = 'mail')
) AS tt ) 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) LEFT JOIN subdef FORCE INDEX (unicite) ON (tt.record_id = subdef.record_id)
WHERE subdef.name = tt.final WHERE subdef.name = tt.final
GROUP BY " . $on . ", usrid GROUP BY " . $on . ", usrid

6
lib/classes/module/report/sqlaction.php
View File

@@ -50,7 +50,7 @@ class module_report_sqlaction extends module_report_sql implements module_report
SELECT DISTINCT(log.id), log.usrid, log.user, d.final, d.comment, d.record_id, d.date, record.mime, record.originalname as file SELECT DISTINCT(log.id), log.usrid, log.user, d.final, d.comment, d.record_id, d.date, record.mime, record.originalname as file
FROM (log_docs AS d) FROM (log_docs AS d)
INNER JOIN log FORCE INDEX (date_site) ON (log.id = d.log_id) INNER JOIN log FORCE INDEX (date_site) ON (log.id = d.log_id)
INNER JOIN record ON (record.record_id = d.record_id) LEFT JOIN record ON (record.record_id = d.record_id)
WHERE (" . $filter['sql'] . ") AND (d.action = :action) WHERE (" . $filter['sql'] . ") AND (d.action = :action)
) AS tt"; ) AS tt";
@@ -81,7 +81,7 @@ class module_report_sqlaction extends module_report_sql implements module_report
SELECT DISTINCT(log.id), TRIM(" . $this->getTransQuery($this->groupby) . ") AS " . $this->groupby . " , log.usrid , d.final, d.record_id, d.date SELECT DISTINCT(log.id), TRIM(" . $this->getTransQuery($this->groupby) . ") AS " . $this->groupby . " , log.usrid , d.final, d.record_id, d.date
FROM (log_docs as d) FROM (log_docs as d)
INNER JOIN log FORCE INDEX (date_site) ON (log.id = d.log_id) INNER JOIN log FORCE INDEX (date_site) ON (log.id = d.log_id)
INNER JOIN record ON (record.record_id = d.record_id) LEFT JOIN record ON (record.record_id = d.record_id)
WHERE (" . $filter['sql'] . ") AND (d.action = :action) WHERE (" . $filter['sql'] . ") AND (d.action = :action)
) AS tt ) AS tt
LEFT JOIN subdef AS s ON (s.record_id=tt.record_id) LEFT JOIN subdef AS s ON (s.record_id=tt.record_id)
@@ -111,7 +111,7 @@ class module_report_sqlaction extends module_report_sql implements module_report
SELECT DISTINCT(log.id), " . $this->getTransQuery($field) . " AS val SELECT DISTINCT(log.id), " . $this->getTransQuery($field) . " AS val
FROM (log_docs as d) FROM (log_docs as d)
INNER JOIN log FORCE INDEX (date_site) ON (log.id = d.log_id) INNER JOIN log FORCE INDEX (date_site) ON (log.id = d.log_id)
INNER JOIN record ON (record.record_id = d.record_id) LEFT JOIN record ON (record.record_id = d.record_id)
LEFT JOIN subdef as s ON (s.record_id=d.record_id AND s.name='document') LEFT JOIN subdef as s ON (s.record_id=d.record_id AND s.name='document')
WHERE (" . $filter['sql'] . ") WHERE (" . $filter['sql'] . ")
AND (d.action = :action) AND (d.action = :action)

12
lib/classes/module/report/sqldownload.php
View File

@@ -95,8 +95,8 @@ class module_report_sqldownload extends module_report_sql implements module_repo
SELECT DISTINCT(log.id), TRIM(' . $field . ') AS ' . $name . ' SELECT DISTINCT(log.id), TRIM(' . $field . ') AS ' . $name . '
FROM log FORCE INDEX (date_site) FROM log FORCE INDEX (date_site)
INNER JOIN log_docs ON (log.id = log_docs.log_id) INNER JOIN log_docs ON (log.id = log_docs.log_id)
INNER JOIN record ON (log_docs.record_id = record.record_id) LEFT JOIN record ON (log_docs.record_id = record.record_id)
INNER JOIN subdef ON ( log_docs.record_id = subdef.record_id)'; LEFT JOIN subdef ON ( log_docs.record_id = subdef.record_id)';
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $this->sql), FILE_APPEND); // no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $this->sql), FILE_APPEND);
} else { } else {
$this->sql = ' $this->sql = '
@@ -105,8 +105,8 @@ class module_report_sqldownload extends module_report_sql implements module_repo
SELECT DISTINCT(log.id), TRIM( ' . $this->getTransQuery($this->groupby) . ') AS ' . $name . ' SELECT DISTINCT(log.id), TRIM( ' . $this->getTransQuery($this->groupby) . ') AS ' . $name . '
FROM log FORCE INDEX (date_site) FROM log FORCE INDEX (date_site)
INNER JOIN log_docs ON (log.id = log_docs.log_id) INNER JOIN log_docs ON (log.id = log_docs.log_id)
INNER JOIN record ON (log_docs.record_id = record.record_id) LEFT JOIN record ON (log_docs.record_id = record.record_id)
INNER JOIN subdef ON (record.record_id = subdef.record_id)'; LEFT JOIN subdef ON (record.record_id = subdef.record_id)';
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $this->sql), FILE_APPEND); // no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n%s\n\n", __FILE__, __LINE__, $this->sql), FILE_APPEND);
} }
@@ -150,8 +150,8 @@ class module_report_sqldownload extends module_report_sql implements module_repo
SELECT DISTINCT(log.id), ' . $this->getTransQuery($field) . ' AS val SELECT DISTINCT(log.id), ' . $this->getTransQuery($field) . ' AS val
FROM log FORCE INDEX (date_site) FROM log FORCE INDEX (date_site)
INNER JOIN log_docs ON (log.id = log_docs.log_id) INNER JOIN log_docs ON (log.id = log_docs.log_id)
INNER JOIN record ON (log_docs.record_id = record.record_id) LEFT JOIN record ON (log_docs.record_id = record.record_id)
INNER JOIN subdef ON (log_docs.record_id = subdef.record_id) LEFT JOIN subdef ON (log_docs.record_id = subdef.record_id)
WHERE (' . $filter['sql'] . ') WHERE (' . $filter['sql'] . ')
AND (log_docs.action = "download" OR log_docs.action = "mail")' . AND (log_docs.action = "download" OR log_docs.action = "mail")' .
($this->on == 'DOC' ? ' AND subdef.name = "document"' : '') . ($this->on == 'DOC' ? ' AND subdef.name = "document"' : '') .