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

Fix latest merge

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-12-15 11:40:30 +01:00
parent 086669a39e
commit 088b0672cb
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Command/Developer/IniReset.php
View File

@@ -207,7 +207,7 @@ class IniReset extends Command
}
$output->writeln('Upgrading from v3.1 to v'.Version::getNumber());
$cmd = 'php ' . __DIR__ . '/../../../../../bin/setup system:upgrade -y -f';
$cmd = 'php ' . __DIR__ . '/../../../../../bin/setup system:upgrade -y -f -v';
$process = new Process($cmd);
$process->run(function ($type, $buffer) {
if ('err' === $type) {

10
lib/Alchemy/Phrasea/Model/Repositories/UserRepository.php
View File

@@ -50,6 +50,16 @@ class UserRepository extends EntityRepository
return $this->findOneBy(['login' => $login]);
}
/**
* Finds deleted users.
*
* @return User[]
*/
public function findDeleted()
{
return $this->findBy(['deleted' => true]);
}
/**
* Finds a user by email.
*

15
lib/classes/patch/386alpha4a.php
View File

@@ -58,23 +58,14 @@ class patch_386alpha4a implements patchInterface
*/
public function apply(base $appbox, Application $app)
{
$sql = 'SELECT usr_id FROM usr WHERE usr_login LIKE "(#deleted_%"';
$stmt = $appbox->get_connection()->prepare($sql);
$stmt->execute();
$repo = $app['EM']->getRepository('Entities\UsrList');
$users = $stmt->fetchAll(\PDO::FETCH_ASSOC);
foreach ($users as $user) {
foreach ($repo->findUserLists(new \User_Adapter($user['usr_id'], $app)) as $list) {
$repo = $app['EM']->getRepository('Phraseanet:UsrList');
foreach ($app['EM']->getRepository('Phraseanet:User')->findDeleted() as $user) {
foreach ($repo->findUserLists($user) as $list) {
$app['EM']->remove($list);
}
$app['EM']->flush();
}
$stmt->closeCursor();
return true;
}
}