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

Modify collections filter & add JOIN on log_colls table

Browse Source 
Create entries in log_colls table

Fix SQL issue

Fix SQL issues

Update version

Add patch

Remove debug output

Fix CS

Fic CS

Add table schema

Fix Cs

Update patch

Update patch

Update patch

Update patch

Update patch

delete all coll_list call

Fix logger issue

Fix log_colls table structure definition

Rename patch

Fix SQL Issues

Fix patch

Fix test

Fix tests
This commit is contained in:
Nicolas Le Goff
2012-11-07 13:01:09 +01:00
parent 6c1f760813
commit 07300af3f4
15 changed files with 373 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,13 +52,13 @@ class module_report_sqlaction extends module_report_sql implements module_report
$this->sql =
"
SELECT log.usrid, log.user , d.final as getter, d.record_id, d.date, s.*
FROM (log_docs as d
INNER JOIN log ON " . $site_filter['sql'] . "
AND log.id = d.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";
SELECT log.usrid, log.user , d.final as getter, d.record_id, d.date, s.*
FROM (log_docs as d)
INNER JOIN log ON (" . $site_filter['sql'] . " AND log.id = d.log_id)
INNER JOIN log_colls 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";
$this->sql .= $report_filter['sql'] . " AND (d.action = :action)";
@@ -83,15 +83,15 @@ class module_report_sqlaction extends module_report_sql implements module_report
$params = array_merge($params, $site_filter['params'], $report_filter['params'], $record_filter['params']);
$this->sql = "
SELECT TRIM(" . $this->getTransQuery($this->groupby) . ")
as " . $this->groupby . ",
SUM(1) as nombre
FROM (log_docs as d
INNER JOIN log ON " . $site_filter['sql'] . "
AND log.id = d.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 ";
SELECT TRIM(" . $this->getTransQuery($this->groupby) . ")
as " . $this->groupby . ",
SUM(1) as nombre
FROM (log_docs as d)
INNER JOIN log ON (" . $site_filter['sql'] . " AND log.id = d.log_id)
INNER JOIN log_colls 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 ";
$this->sql .= $report_filter['sql'] . " AND (d.action = :action)";
@@ -122,12 +122,13 @@ class module_report_sqlaction extends module_report_sql implements module_report
$sql = "
SELECT DISTINCT(" . $this->getTransQuery($field) . ") as val
FROM (log_docs as d
INNER JOIN log ON (" . $site_filter['sql'] . "
AND log.id = d.log_id
AND " . $date_filter['sql'] . ")
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'))
FROM (log_docs as d)
INNER JOIN log ON (" . $site_filter['sql'] . "
AND log.id = d.log_id
AND " . $date_filter['sql'] . ")
INNER JOIN log_colls 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 ";
if ($this->filter->getReportFilter()) {