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

Fix #134 : browsing a story

Browse Source
This commit is contained in:
Romain Neutron
2011-12-30 11:40:21 +01:00
parent 32ddd4aee8
commit d0fc37b957
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/classes/basketCollection.class.php
View File

@@ -151,7 +151,9 @@ class basketCollection
$appbox = appbox::get_instance(); $appbox = appbox::get_instance();
$conn = $appbox->get_connection(); $conn = $appbox->get_connection();
$session = $appbox->get_session(); $session = $appbox->get_session();
$sql = 'SELECT ssel_id FROM sselnew WHERE usr_id = :usr_id'; $sql = 'SELECT n.ssel_id FROM sselnew n, ssel s
WHERE s.ssel_id = n.ssel_id AND n.usr_id = :usr_id
AND n.usr_id = s.usr_id';
$stmt = $conn->prepare($sql); $stmt = $conn->prepare($sql);
$stmt->execute(array(':usr_id' => $session->get_usr_id())); $stmt->execute(array(':usr_id' => $session->get_usr_id()));
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC); $rs = $stmt->fetchAll(PDO::FETCH_ASSOC);

3
lib/classes/record/preview.class.php
View File

@@ -112,8 +112,7 @@ class record_preview extends record_adapter
break; break;
case "REG": case "REG":
$contId = explode('_', $contId); $contId = explode('_', $contId);
$base_id = $contId[0]; $sbas_id = $contId[0];
$sbas_id = phrasea::sbasFromBas($base_id);
$record_id = $contId[1]; $record_id = $contId[1];
$this->container = new record_adapter($sbas_id, $record_id); $this->container = new record_adapter($sbas_id, $record_id);

2
templates/web/prod/basket_element.twig
View File

@@ -9,7 +9,7 @@
{% import 'common/thumbnail.html' as thumbnail %} {% import 'common/thumbnail.html' as thumbnail %}
{% set record = basket_element.get_record() %} {% set record = basket_element.get_record() %}
<div ondblclick="{% if basket_scope == 'groupings' %}openPreview('REG',{{basket_element.get_order()}},'{{basket.get_base_id()}}_{{basket.get_record_id()}}');{% else %}openPreview('BASK',{{basket_element.get_order()}},{{basket.get_ssel_id()}});{% endif %}" <div ondblclick="{% if basket_scope == 'groupings' %}openPreview('REG',{{basket_element.get_order()}},'{{basket.get_sbas_id()}}_{{basket.get_record_id()}}');{% else %}openPreview('BASK',{{basket_element.get_order()}},{{basket.get_ssel_id()}});{% endif %}"
id="CHIM_{{basket_element.get_sselcont_id()}}_{{record.get_serialize_key()}}" id="CHIM_{{basket_element.get_sselcont_id()}}_{{record.get_serialize_key()}}"
sbas="{{basket_record.get_sbas_id()}}" class="CHIM diapo CHIM_{{record.get_serialize_key()}}" style="height:{{box_height}}px;"> sbas="{{basket_record.get_sbas_id()}}" class="CHIM diapo CHIM_{{record.get_serialize_key()}}" style="height:{{box_height}}px;">
{% if user.getPrefs('basket_title_display') == '1' %} {% if user.getPrefs('basket_title_display') == '1' %}

2
templates/web/prod/results/record.html
View File

@@ -13,7 +13,7 @@
<div style="width:{{th_size+30}}px;" sbas="{{sbas_id}}" <div style="width:{{th_size+30}}px;" sbas="{{sbas_id}}"
id="{{ prefix|default('IMGT') }}_{{record.get_sbas_id}}_{{record.get_record_id}}" id="{{ prefix|default('IMGT') }}_{{record.get_sbas_id}}_{{record.get_record_id}}"
class="IMGT diapo grouping type-{{record.get_type}}" class="IMGT diapo grouping type-{{record.get_type}}"
onDblClick="openPreview('REG','0','{{record.get_base_id}}_{{record.get_record_id}}');"> onDblClick="openPreview('REG','0','{{record.get_serialize_key()}}');">
{% else %} {% else %}
<div style="width:{{th_size+30}}px;" sbas="{{sbas_id}}" <div style="width:{{th_size+30}}px;" sbas="{{sbas_id}}"
id="{{ prefix|default('IMGT') }}_{{record.get_sbas_id}}_{{record.get_record_id}}" id="{{ prefix|default('IMGT') }}_{{record.get_sbas_id}}_{{record.get_record_id}}"