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

fix #153 No display of thumbs in report

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-01-04 15:15:47 +01:00
parent 43fbee03c2
commit b321d1540e
2 changed files with 10 additions and 10 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) public function buildTabUserWhat($bid, $rid, $tab = false)
{ {
$this->initialize();
$sbas_id = phrasea::sbasFromBas($bid); $sbas_id = phrasea::sbasFromBas($bid);
$record = new record_adapter($sbas_id, $rid); $record = new record_adapter($sbas_id, $rid);
$this->setDisplay($tab); $this->setDisplay($tab);
$this->initialize();
$this->champ = array( $this->champ = array(
'photo', 'photo',
'record_id', 'record_id',
@@ -593,7 +593,7 @@ class module_report_nav extends module_report
$x = $record->get_thumbnail(); $x = $record->get_thumbnail();
$this->result = array( $this->result[] = array(
'photo' => 'photo' =>
"<img style='width:" . $x->get_width() . "px;height:" . $x->get_height() . "px;' "<img style='width:" . $x->get_width() . "px;height:" . $x->get_height() . "px;'
src='" . $x->get_url() . "'>" src='" . $x->get_url() . "'>"
@@ -603,10 +603,10 @@ class module_report_nav extends module_report
, 'titre' => $record->get_title() , 'titre' => $record->get_title()
, 'taille' => $document->get_size() , 'taille' => $document->get_size()
); );
$this->setDisplayNav(); $this->setDisplayNav();
$this->setReport(); $this->setReport();
return $this->report; return $this->report;
} }

12
templates/web/report/generate_tab.twig
View File

@@ -74,18 +74,18 @@
{% endif %} {% endif %}
{% for class, config in result.display %} {% for class, config in result.display %}
<td class="{{ class }}"> <td class="{{ class }}">
{% for key , result in value %} {% for key , res in value %}
{% if key == class %} {% if key == class %}
{% if config.bound == 1 and "</i>" not in result %} {% if config.bound == 1 and "</i>" not in res %}
{% if key == "user" and value.user == "<b>TOTAL</b>"%} {% if key == "user" and value.user == "<b>TOTAL</b>"%}
{{ result|raw }} {{ res|raw }}
{% elseif is_nav or is_doc %} {% elseif is_nav or is_doc %}
<a href="#" rel ="" class="{{result}} bound">{{ result|raw }}</a> <a href="#" rel ="" class="{{res}} bound">{{ res|raw }}</a>
{% else %} {% else %}
<a href="#" rel ="" class="{{value.usrid}} bound">{{ result|raw }}</a> <a href="#" rel ="" class="{{value.usrid}} bound">{{ res|raw }}</a>
{% endif %} {% endif %}
{% else %} {% else %}
{{ result|raw }} {{ res|raw }}
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}