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

Basket route

Browse Source
This commit is contained in:
Romain Neutron
2011-12-19 18:24:16 +01:00
parent efb42bf2eb
commit e1dce46c9c
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Application/Prod.php
View File

@@ -98,7 +98,7 @@ return call_user_func(function()
, 'message' => $e->getMessage()
);
$json = $app['Core']['Serializer']->serialize('json', $datas);
$json = $app['Core']['Serializer']->serialize($datas, 'json');
return new Response($json, 200, array('Content-Type' => 'application/json'));
}

6
lib/Alchemy/Phrasea/Controller/Prod/Basket.php
View File

@@ -185,6 +185,8 @@ class Basket implements ControllerProviderInterface
$em = $app['Core']->getEntityManager();
$n = 0;
foreach (explode(';', $request->get('lst')) as $sbas_rec)
{
$sbas_rec = explode('_', $sbas_rec);
@@ -205,10 +207,12 @@ class Basket implements ControllerProviderInterface
$basket_element = new \Entities\BasketElement();
$basket_element->setRecord($record);
$basket_element->setBasket($basket);
$em->persist($basket_element);
$basket->addBasketElement($basket_element);
$n++;
}
catch (\Exception_NotFound $e)
{
@@ -221,7 +225,7 @@ class Basket implements ControllerProviderInterface
$data = array(
'success' => true
, 'message' => _('Basket has been deleted')
, 'message' => sprintf(_('%d records added'), $n)
);
if ($request->getRequestFormat() == 'json')

2
lib/conf.d/Doctrine/Entities.BasketElement.dcm.yml
View File

@@ -36,4 +36,4 @@ Entities\BasketElement:
targetEntity: ValidationData
mappedBy: basket_element
lifecycleCallbacks:
postPersist: [ setLastInBasket ]
prePersist: [ setLastInBasket ]

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

@@ -11,7 +11,7 @@
<div ondblclick="{% if basket_scope == 'groupings' %}openPreview('REG',{{basket_element.getOrd()}},'{{basket.get_base_id()}}_{{basket.get_record_id()}}');{% else %}openPreview('BASK',{{basket_element.getOrd()}},{{basket.getId()}});{% endif %}"
id="CHIM_{{basket_element.getId()}}_{{record.get_serialize_key()}}"
sbas="{{basket_record.get_sbas_id()}}" class="CHIM diapo CHIM_{{record.get_serialize_key()}}" style="height:{{box_height}}px;">
class="CHIM diapo CHIM_{{record.get_serialize_key()}}" style="height:{{box_height}}px;">
{% if user.getPrefs('basket_title_display') == '1' %}
<div class="title">
{{record.get_title()}}
@@ -27,7 +27,7 @@
</div>
{{thumbnail.format(record.get_thumbnail,82,82, '', session, true)}}
<div class="bottom">
<span id="sselcontrem_{{basket.get_ssel_id()}}_{{basket_element.getId()}}" class="{{basket_scope}}"
<span id="sselcontrem_{{basket.getId()}}_{{basket_element.getId()}}" class="{{basket_scope}}"
onmousedown="event.cancelBubble=true;return false;" onclick="removeFromBasket(this);return false;" title="{% trans 'delete'%}" >X</span>
{% if user.getPrefs('basket_caption_display') == '1' %}
<div class="captionRolloverTips" tooltipsrc="/prod/tooltip/caption/{{record.get_sbas_id()}}/{{record.get_record_id()}}/basket/?number={{record.get_number()}}"></div>