Skip to content
Snippets Groups Projects
Commit fbff6815 authored by Camille Simiand's avatar Camille Simiand
Browse files

Refacto

parent 098bedd2
No related branches found
No related tags found
1 merge request!45tuleap-81-allow-a-new-user-to-access-the-capsule-edition-mode
...@@ -61,7 +61,8 @@ class CapsuleEditorController extends AbstractController ...@@ -61,7 +61,8 @@ class CapsuleEditorController extends AbstractController
} }
$current_capsule_editors_users = $capsule->getEditors()->toArray(); $current_capsule_editors_users = $capsule->getEditors()->toArray();
if (! in_array($current_user, $current_capsule_editors_users)) { if (! $capsule->getEditors()->contains($current_user)) {
// in_array($current_user, $current_capsule_editors_users)) {
$this->addFlash( $this->addFlash(
'warning', 'warning',
$this->translator->trans( $this->translator->trans(
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
namespace App\DataFixtures; namespace App\DataFixtures;
use App\Builder\CapsuleBuilder; use App\Builder\CapsuleBuilder;
use App\Entity\CapsuleEditor;
use App\Entity\User; use App\Entity\User;
use DateTime; use DateTime;
use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Bundle\FixturesBundle\Fixture;
...@@ -67,11 +66,6 @@ class CapsuleFixtures extends Fixture implements DependentFixtureInterface ...@@ -67,11 +66,6 @@ class CapsuleFixtures extends Fixture implements DependentFixtureInterface
} }
); );
// $editor = new CapsuleEditor();
// $editor->setCapsuleId(1);
// $editor->setUserId(3);
// $manager->persist($editor);
$manager->flush(); $manager->flush();
} }
......
...@@ -66,16 +66,10 @@ class UserRepository extends ServiceEntityRepository implements PasswordUpgrader ...@@ -66,16 +66,10 @@ class UserRepository extends ServiceEntityRepository implements PasswordUpgrader
*/ */
public function getUsersFromIds(array $user_ids): array public function getUsersFromIds(array $user_ids): array
{ {
$users = []; return $this->createQueryBuilder('u')
->andWhere('u.id in (:ids)')
foreach ($user_ids as $user_id) { ->setParameter('ids', $user_ids)
$user = $this->findOneBy(['id' => $user_id]); ->getQuery()
if (null === $user) { ->getResult();
throw new Exception('User was not found');
}
$users[] = $user;
}
return $users;
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment