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

Merge pull request #1387 from bburnichon/feature/update-account-400-error-phras-547

Browse Source 
Fixes PHRAS-547 and PHRAS-551
This commit is contained in:
Benoît Burnichon
2015-06-02 11:59:46 +02:00
parent 3504d29add 89df907285
commit 6b7b56a649
4 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Alchemy/Phrasea/Controller/Admin/UserController.php
View File

@@ -356,14 +356,19 @@ class UserController extends Controller
$userRegistrations = []; $userRegistrations = [];
/** @var RegistrationRepository $registrationRepository */ /** @var RegistrationRepository $registrationRepository */
$registrationRepository = $this->app['repo.registrations']; $registrationRepository = $this->app['repo.registrations'];
foreach ( $collections = $this->getAclForConnectedUser()->get_granted_base(['canadmin']);
$registrationRepository->getUserRegistrations( $authenticatedUserId = $authenticatedUser->getId();
$authenticatedUser, foreach ($registrationRepository->getPendingRegistrations($collections) as $registration) {
$this->getAclForConnectedUser()->get_granted_base(['canadmin'])
) as $registration) {
$user = $registration->getUser(); $user = $registration->getUser();
$userRegistrations[$user->getId()]['user'] = $user; $userId = $user->getId();
$userRegistrations[$user->getId()]['registrations'][$registration->getBaseid()] = $registration; // Can not handle self registration.
if ($authenticatedUserId == $userId) {
continue;
}
if (!isset($userRegistrations[$userId])) {
$userRegistrations[$userId] = ['user' => $user, 'registrations' => []];
}
$userRegistrations[$userId]['registrations'][$registration->getBaseid()] = $registration;
} }
return $this->render('admin/user/registrations.html.twig', [ return $this->render('admin/user/registrations.html.twig', [

2
lib/Alchemy/Phrasea/ControllerProvider/Root/Account.php
View File

@@ -338,7 +338,7 @@ class Account implements ControllerProviderInterface
*/ */
public function updateAccount(PhraseaApplication $app, Request $request) public function updateAccount(PhraseaApplication $app, Request $request)
{ {
$registrations = $request->request->get('registrations'); $registrations = $request->request->get('registrations', []);
if (false === is_array($registrations)) { if (false === is_array($registrations)) {
$app->abort(400, '"registrations" parameter must be an array of base ids.'); $app->abort(400, '"registrations" parameter must be an array of base ids.');
} }

2
lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php
View File

@@ -644,7 +644,7 @@ SQL;
* Return an instance of native cache query for default ORM * Return an instance of native cache query for default ORM
* @todo return an instance of NativeQueryProvider for given orm; * @todo return an instance of NativeQueryProvider for given orm;
*/ */
$app['orm.orm.em.native-query'] = $app->share(function ($app) { $app['orm.em.native-query'] = $app->share(function ($app) {
return new NativeQueryProvider($app['orm.em']); return new NativeQueryProvider($app['orm.em']);
}); });

23
lib/Alchemy/Phrasea/Model/Repositories/RegistrationRepository.php
View File

@@ -49,6 +49,29 @@ class RegistrationRepository extends EntityRepository
return $qb->getQuery()->getResult(); return $qb->getQuery()->getResult();
} }
/**
* Get Current pending registrations.
*
* @param \collection[] $collections
* @return Registration[]
*/
public function getPendingRegistrations(array $collections)
{
$builder = $this->createQueryBuilder('r');
$builder->where('r.pending = 1');
if (!empty($collections)) {
$builder->andWhere('r.baseId IN (:bases)');
$builder->setParameter('bases', array_map(function (\collection $collection) {
return $collection->get_base_id();
}, $collections));
}
$builder->orderBy('r.created', 'DESC');
return $builder->getQuery()->getResult();
}
/** /**
* Gets registration registrations for a user. * Gets registration registrations for a user.
* *