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

merge master

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-04-27 18:49:38 +02:00
parent e90761a696 f8f6c97918
commit b4ce89fad6
4 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/classes/record/adapter.class.php
View File

@@ -1572,6 +1572,16 @@ class record_adapter implements record_Interface, cache_cacheableInterface
$stmt->execute(array(':record_id' => $this->get_record_id()));
$stmt->closeCursor();
$base_ids = array_map(function($collection) {
return $collection->get_base_id();
}, $this->databox->get_collections());
$sql = "DELETE FROM order_elements WHERE record_id = :record_id AND base_id IN (" . implode(', ', $base_ids) . ")";
$stmt = $conn->prepare($sql);
$stmt->execute(array(':record_id' => $this->get_record_id()));
$stmt->closeCursor();
$em = bootstrap::getCore()->getEntityManager();
$repository = $em->getRepository('\Entities\BasketElement');

9
lib/classes/set/exportorder.class.php
View File

@@ -24,6 +24,7 @@ class set_exportorder extends set_export
* @param String $usage
* @param String $deadline
* @return boolean
* @return $order_id
*/
public function order_available_elements($from_usr_id, $usage, $deadline)
{
@@ -96,7 +97,7 @@ class set_exportorder extends set_export
$evt_mngr->trigger('__NEW_ORDER__', $params);
return true;
return $order_id;
}
/**
@@ -106,10 +107,10 @@ class set_exportorder extends set_export
protected function get_orderable_lst()
{
$ret = array();
foreach ($this as $basrec => $download_element) {
foreach ($download_element->get_orderable() as $name => $bool) {
foreach ($this as $download_element) {
foreach ($download_element->get_orderable() as $bool) {
if ($bool === true) {
$ret[] = $basrec;
$ret[] = $download_element->get_serialize_key();
}
}
}