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

Remove references to collection filter

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-11-05 12:57:48 +01:00
parent a353dc4de6
commit d7b8a67ac3
9 changed files with 5 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,6 @@ 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
FROM (log_docs AS d)
INNER JOIN log FORCE INDEX (date_site) ON (log.id = d.log_id)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
INNER JOIN record ON (record.record_id = d.record_id)
WHERE (" . $filter['sql'] . ") AND (d.action = :action)
) AS tt";
@@ -82,7 +81,6 @@ 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
FROM (log_docs as d)
INNER JOIN log FORCE INDEX (date_site) ON (log.id = d.log_id)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
INNER JOIN record ON (record.record_id = d.record_id)
WHERE (" . $filter['sql'] . ") AND (d.action = :action)
) AS tt
@@ -113,7 +111,6 @@ class module_report_sqlaction extends module_report_sql implements module_report
SELECT DISTINCT(log.id), " . $this->getTransQuery($field) . " AS val
FROM (log_docs as d)
INNER JOIN log FORCE INDEX (date_site) ON (log.id = d.log_id)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
INNER 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')
WHERE (" . $filter['sql'] . ")