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

Merge branch 'regs' into 3.6

Browse Source
This commit is contained in:
Romain Neutron
2012-01-04 18:08:33 +01:00
parent 30e4b37888 d04ba1e76c
commit b1710cabb6
6 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/classes/module/report/nav.class.php
View File

@@ -573,11 +573,11 @@ class module_report_nav extends module_report
*/
public function buildTabUserWhat($bid, $rid, $tab = false)
{
$this->initialize();
$sbas_id = phrasea::sbasFromBas($bid);
$record = new record_adapter($sbas_id, $rid);
$this->setDisplay($tab);
$this->initialize();
$this->champ = array(
'photo',
'record_id',
@@ -593,7 +593,7 @@ class module_report_nav extends module_report
$x = $record->get_thumbnail();
$this->result = array(
$this->result[] = array(
'photo' =>
"<img style='width:" . $x->get_width() . "px;height:" . $x->get_height() . "px;'
src='" . $x->get_url() . "'>"
@@ -603,10 +603,10 @@ class module_report_nav extends module_report
, 'titre' => $record->get_title()
, 'taille' => $document->get_size()
);
$this->setDisplayNav();
$this->setReport();
return $this->report;
}