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 with 3.6

Browse Source
This commit is contained in:
Romain Neutron
2012-03-12 18:40:21 +01:00
parent a5202296e4 b84ad68a20
commit 7a0495caf3
212 changed files with 18953 additions and 32930 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/Proxies/__CG__EntitiesBasket.php
View File

@@ -229,4 +229,4 @@ class Basket extends \Entities\Basket implements \Doctrine\ORM\Proxy\Proxy
}
}
}
}

20
lib/Doctrine/Repositories/BasketElementRepository.php
View File

@@ -17,7 +17,7 @@ class BasketElementRepository extends EntityRepository
public function findUserElement($element_id, \User_Adapter $user)
{
$dql = 'SELECT e, b, s, p, vd
$dql = 'SELECT e
FROM Entities\BasketElement e
JOIN e.basket b
LEFT JOIN e.validation_datas vd
@@ -35,9 +35,6 @@ class BasketElementRepository extends EntityRepository
$query = $this->_em->createQuery($dql);
$query->setParameters($params);
// $cacheId = "_user_basket_element_" . $element_id . "_" . $user->get_id() . Entities\BasketElement::CACHE_SUFFIX;
// $query->useResultCache(true, 1800, $cacheId);
$element = $query->getOneOrNullResult();
/* @var $element \Entities\BasketElement */
@@ -51,7 +48,7 @@ class BasketElementRepository extends EntityRepository
public function findElementsByRecord(\record_adapter $record)
{
$dql = 'SELECT e, b, s, p
$dql = 'SELECT e
FROM Entities\BasketElement e
JOIN e.basket b
LEFT JOIN b.validation s
@@ -67,9 +64,6 @@ class BasketElementRepository extends EntityRepository
$query = $this->_em->createQuery($dql);
$query->setParameters($params);
// $cacheId = "_basket_element_by_record_" . $record->get_serialize_key() . Entities\BasketElement::CACHE_SUFFIX;
// $query->useResultCache(true, 1800, $cacheId);
return $query->getResult();
}
@@ -81,7 +75,7 @@ class BasketElementRepository extends EntityRepository
*/
public function findReceivedElementsByRecord(\record_adapter $record, \User_Adapter $user)
{
$dql = 'SELECT e, b, s, p
$dql = 'SELECT e
FROM Entities\BasketElement e
JOIN e.basket b
LEFT JOIN b.validation s
@@ -100,15 +94,12 @@ class BasketElementRepository extends EntityRepository
$query = $this->_em->createQuery($dql);
$query->setParameters($params);
// $cacheId = "_receveid_element_by_record_" . $record->get_serialize_key() . "_" . $user->getId() . Entities\BasketElement::CACHE_SUFFIX;
// $query->useResultCache(true, 1800, $cacheId);
return $query->getResult();
}
public function findReceivedValidationElementsByRecord(\record_adapter $record, \User_Adapter $user)
{
$dql = 'SELECT e, b, v, p
$dql = 'SELECT e
FROM Entities\BasketElement e
JOIN e.basket b
JOIN b.validation v
@@ -126,9 +117,6 @@ class BasketElementRepository extends EntityRepository
$query = $this->_em->createQuery($dql);
$query->setParameters($params);
// $cacheId = "_receveid_validation_element_by_record" . $record->get_serialize_key() . "_" . $user->getId() . Entities\BasketElement::CACHE_SUFFIX;
// $query->useResultCache(true, 1800, $cacheId);
return $query->getResult();
}

91
lib/Doctrine/Repositories/BasketRepository.php
View File

@@ -37,11 +37,9 @@ class BasketRepository extends EntityRepository
*/
public function findActiveByUser(\User_Adapter $user, $sort = null)
{
$dql = 'SELECT b, e, s, p
$dql = 'SELECT b
FROM Entities\Basket b
LEFT JOIN b.elements e
LEFT JOIN b.validation s
LEFT JOIN s.participants p
WHERE b.usr_id = :usr_id
AND b.archived = false';
@@ -57,9 +55,6 @@ class BasketRepository extends EntityRepository
$query = $this->_em->createQuery($dql);
$query->setParameters(array('usr_id' => $user->get_id()));
// $idCache = "_active_by_user_" . ($sort === null ? "" : $sort. "_" ) . $user->get_id() . Entities\Basket::CACHE_SUFFIX;
// $query->useResultCache(true, 1800, $idCache);
return $query->getResult();
}
@@ -71,7 +66,7 @@ class BasketRepository extends EntityRepository
*/
public function findUnreadActiveByUser(\User_Adapter $user)
{
$dql = 'SELECT b, e, s, p
$dql = 'SELECT b
FROM Entities\Basket b
JOIN b.elements e
LEFT JOIN b.validation s
@@ -79,9 +74,11 @@ class BasketRepository extends EntityRepository
WHERE b.archived = false
AND (
(b.usr_id = :usr_id_owner AND b.is_read = false)
OR (b.usr_id != :usr_id_ownertwo AND p.usr_id = :usr_id_participant
AND p.is_aware = false)
OR (b.usr_id != :usr_id_ownertwo
AND p.usr_id = :usr_id_participant
AND p.is_aware = false)
)
AND (s.expires IS NULL OR s.expires > CURRENT_TIMESTAMP())
ORDER BY e.ord ASC';
$params = array(
@@ -93,9 +90,6 @@ class BasketRepository extends EntityRepository
$query = $this->_em->createQuery($dql);
$query->setParameters($params);
// $idCache = "findUnreadActiveByUser" . $user->get_id() . Entities\Basket::CACHE_SUFFIX;
// $query->useResultCache(true, 1800, $idCache);
return $query->getResult();
}
@@ -108,7 +102,7 @@ class BasketRepository extends EntityRepository
*/
public function findActiveValidationByUser(\User_Adapter $user, $sort = null)
{
$dql = 'SELECT b, e, s, p, v
$dql = 'SELECT b
FROM Entities\Basket b
JOIN b.elements e
JOIN e.validation_datas v
@@ -129,9 +123,6 @@ class BasketRepository extends EntityRepository
$query = $this->_em->createQuery($dql);
$query->setParameters(array(1 => $user->get_id(), 2 => $user->get_id()));
// $idCache = "_active_validation_by_user_" . $user->get_id() . "_" . $sort . Entities\Basket::CACHE_SUFFIX;
// $query->useResultCache(true, 1800, $idCache);
return $query->getResult();
}
@@ -146,21 +137,15 @@ class BasketRepository extends EntityRepository
*/
public function findUserBasket($basket_id, \User_Adapter $user, $requireOwner)
{
$dql = 'SELECT b, e, s, p, v
$dql = 'SELECT b, e
FROM Entities\Basket b
LEFT JOIN b.elements e
LEFT JOIN e.validation_datas v
LEFT JOIN b.validation s
LEFT JOIN s.participants p
WHERE b.id = :basket_id
ORDER BY e.ord ASC';
$query = $this->_em->createQuery($dql);
$query->setParameters(array('basket_id' => $basket_id));
// $cacheId = "_find_user_" . $basket_id . Entities\Basket::CACHE_SUFFIX;
// $query->useResultCache(true, 1800, $cacheId);
$basket = $query->getOneOrNullResult();
/* @var $basket \Entities\Basket */
@@ -173,7 +158,6 @@ class BasketRepository extends EntityRepository
{
$participant = false;
$basket = $this->_em->merge($basket);
if ($basket->getValidation() && !$requireOwner)
{
try
@@ -213,9 +197,6 @@ class BasketRepository extends EntityRepository
$query = $this->_em->createQuery($dql);
$query->setParameters($params);
// $idCache = "_containing_record_" . $record->get_serialize_key() . Entities\Basket::CACHE_SUFFIX;
// $query->useResultCache(true, 1800, $idCache);
return $query->getResult();
}
@@ -235,7 +216,7 @@ class BasketRepository extends EntityRepository
);
break;
case self::VALIDATION_DONE:
$dql = 'SELECT b, e, s
$dql = 'SELECT b, e
FROM Entities\Basket b
JOIN b.elements e
JOIN b.validation s
@@ -247,7 +228,7 @@ class BasketRepository extends EntityRepository
);
break;
case self::VALIDATION_SENT:
$dql = 'SELECT b, v, e
$dql = 'SELECT b, e
FROM Entities\Basket b
JOIN b.elements e
JOIN b.validation v
@@ -257,9 +238,9 @@ class BasketRepository extends EntityRepository
);
break;
default:
$dql = 'SELECT b, e, s, p
$dql = 'SELECT b, e
FROM Entities\Basket b
JOIN b.elements e
LEFT JOIN b.elements e
LEFT JOIN b.validation s
LEFT JOIN s.participants p
WHERE (b.usr_id = :usr_id OR p.usr_id = :validating_usr_id)';
@@ -268,6 +249,17 @@ class BasketRepository extends EntityRepository
'validating_usr_id' => $user->get_id()
);
break;
case self::MYBASKETS:
$dql = 'SELECT b, e
FROM Entities\Basket b
LEFT JOIN b.elements e
LEFT JOIN b.validation s
LEFT JOIN s.participants p
WHERE (b.usr_id = :usr_id)';
$params = array(
'usr_id' => $user->get_id()
);
break;
}
if (ctype_digit($year) && strlen($year) == 4)
@@ -286,7 +278,7 @@ class BasketRepository extends EntityRepository
$params['description'] = '%' . $query . '%';
}
$dql .= ' ORDER BY e.ord ASC';
$dql .= ' ORDER BY b.id DESC, e.ord ASC';
$query = $this->_em->createQuery($dql);
$query->setParameters($params);
@@ -294,12 +286,41 @@ class BasketRepository extends EntityRepository
$count = Paginate::getTotalQueryResults($query);
$paginateQuery = Paginate::getPaginateQuery($query, $offset, $perPage);
// $idCache = "_" . $type . "_workzone_basket_" . $user->get_id() . Entities\Basket::CACHE_SUFFIX;
// $paginateQuery->useResultCache(true, 1800, $idCache);
$result = $paginateQuery->getResult();
return array('count' => $count, 'result' => $result);
}
/**
* Return all actives validation where current user is involved and user basket
* @param \User_Adapter $user
* @param type $sort
* @return Array
*/
public function findActiveValidationAndBasketByUser(\User_Adapter $user, $sort = null)
{
$dql = 'SELECT b, e
FROM Entities\Basket b
LEFT JOIN b.elements e
LEFT JOIN b.validation s
LEFT JOIN s.participants p
WHERE (b.usr_id = :usr_id
AND b.archived = false) OR (b.usr_id != :usr_id AND p.usr_id = :usr_id
AND (s.expires IS NULL OR s.expires > CURRENT_TIMESTAMP()))';
if ($sort == 'date')
{
$dql .= ' ORDER BY b.created DESC, e.ord ASC';
}
elseif ($sort == 'name')
{
$dql .= ' ORDER BY b.name ASC, e.ord ASC';
}
$query = $this->_em->createQuery($dql);
$query->setParameters(array('usr_id' => $user->get_id()));
return $query->getResult();
}
}

35
lib/Doctrine/Repositories/StoryWZRepository.php
View File

@@ -44,7 +44,26 @@ class StoryWZRepository extends EntityRepository
if ($sort == 'name')
{
uasort($stories, array('\\Repositories\\StoryWZRepository', 'title_compare'));
$sortedStories = array();
foreach ($stories as $story)
{
$sortedStories[] = $story->getRecord()->get_title();
}
uasort($sortedStories, function($a, $b)
{
if ($a == $b)
{
return 0;
}
return ($a < $b) ? -1 : 1;
});
foreach ($sortedStories as $idStory => $titleStory)
{
$sortedStories[$idStory] = $stories[$idStory];
}
}
return $stories;
@@ -54,7 +73,7 @@ class StoryWZRepository extends EntityRepository
{
$story = $this->find($id);
if($story)
if ($story)
{
try
{
@@ -66,7 +85,7 @@ class StoryWZRepository extends EntityRepository
throw new \Exception_NotFound('Story not found');
}
if($story->getUser()->get_id() !== $user->get_id())
if ($story->getUser()->get_id() !== $user->get_id())
{
throw new \Exception_Forbidden('You have not access to ths story');
}
@@ -79,16 +98,6 @@ class StoryWZRepository extends EntityRepository
return $story;
}
protected static function title_compare(\Entities\StoryWZ $a, \Entities\StoryWZ $b)
{
if ($a->getRecord()->get_title() == $b->getRecord()->get_title())
{
return 0;
}
return ($a->getRecord()->get_title() < $b->getRecord()->get_title()) ? -1 : 1;
}
public function findUserStory(\User_Adapter $user, \record_adapter $Story)
{
$story = $this->findOneBy(