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

PHRAS-205 #fix validation reorder

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-07-23 16:32:14 +02:00
parent 73ebd220a8
commit c8c10f2776
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,14 +234,22 @@ class Basket implements ControllerProviderInterface
{ {
$basket = $app['EM']->getRepository('\Entities\Basket') $basket = $app['EM']->getRepository('\Entities\Basket')
->findUserBasket($app, $basket_id, $app['authentication']->getUser(), true); ->findUserBasket($app, $basket_id, $app['authentication']->getUser(), true);
$basketElement = $app['EM']->getRepository('\Entities\BasketElement')
->find($basket_element_id);
$ord = $basketElement->getOrd();
foreach ($basket->getElements() as $basket_element) { foreach ($basket->getElements() as $basket_element) {
if ($basket_element->getOrd() > $ord) {
$basket_element->setOrd($basket_element->getOrd() - 1);
}
/* @var $basket_element \Entities\BasketElement */ /* @var $basket_element \Entities\BasketElement */
if ($basket_element->getId() == $basket_element_id) { if ($basket_element->getId() == $basket_element_id) {
$basket->removeElement($basket_element);
$app['EM']->remove($basket_element); $app['EM']->remove($basket_element);
} }
} }
$app['EM']->persist($basket);
$app['EM']->flush(); $app['EM']->flush();
$data = array( $data = array(

2
www/skins/prod/jquery.WorkZone.js
View File

@@ -155,6 +155,8 @@ var p4 = p4 || {};
} }
selectedItem.remove(); selectedItem.remove();
} else {
return p4.WorkZone.reloadCurrent();
} }
} else { } else {
humane.error(data.message); humane.error(data.message);