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

Fix merge 3.8

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-12-09 14:01:00 +01:00
parent 9f38823f27
commit 589169299c
29 changed files with 430 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/classes/module/report.php
View File

@@ -233,12 +233,8 @@ class module_report
/**
*
*/
<<<<<<< HEAD
protected $cor_query = [];
=======
protected $dateField = 'log.date';
protected $cor_query = array();
>>>>>>> 3.8
protected $isInformative;
/**
@@ -840,14 +836,8 @@ class module_report
return $this->report;
}
<<<<<<< HEAD
$databox = $this->app['phraseanet.appbox']->get_databox($this->sbas_id);
$conn = $databox->get_connection();
=======
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
$conn = connection::getPDOConnection($this->app, $this->sbas_id);
>>>>>>> 3.8
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
@@ -861,15 +851,7 @@ class module_report
$stmt->execute($this->params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
<<<<<<< HEAD
} catch (DBALException $e) {
=======
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\ncount==%s\n\n", __FILE__, __LINE__, count($rs)), FILE_APPEND);
} catch (PDOException $e) {
>>>>>>> 3.8
echo $e->getMessage();
return;
}
@@ -886,12 +868,7 @@ class module_report
$this->buildResult($this->app, $rs);
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
//calculate prev and next page
<<<<<<< HEAD
$this->calculatePages();
=======
$this->calculatePages($rs);
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);
>>>>>>> 3.8
//do we display navigator ?
$this->setDisplayNav();
// no_file_put_contents("/tmp/report.txt", sprintf("%s (%s)\n\n", __FILE__, __LINE__), FILE_APPEND);