- remove importers configuration

- add check on userId for findOneByURL for entries
This commit is contained in:
Nicolas Lœuillet
2015-10-26 15:49:44 +01:00
committed by Jeremy Benoist
parent dda57bb944
commit 303768dfe9
7 changed files with 31 additions and 45 deletions

View File

@ -51,15 +51,15 @@ class EntryController extends Controller
if ($form->isValid()) {
$existingEntry = $em
->getRepository('WallabagCoreBundle:Entry')
->findOneByUrl($entry->getUrl());
->findOneByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
if (!is_null($existingEntry)) {
if (count($existingEntry) > 0) {
$this->get('session')->getFlashBag()->add(
'notice',
'Entry already saved on '.$existingEntry->getCreatedAt()->format('d-m-Y')
'Entry already saved on '.$existingEntry[0]->getCreatedAt()->format('d-m-Y')
);
return $this->redirect($this->generateUrl('view', array('id' => $existingEntry->getId())));
return $this->redirect($this->generateUrl('view', array('id' => $existingEntry[0]->getId())));
}
$this->updateEntry($entry);

View File

@ -223,4 +223,21 @@ class EntryRepository extends EntityRepository
->getQuery()
->getResult();
}
/**
* Find an entry by its url and its owner.
*
* @param $url
* @param $userId
*
* @return array
*/
public function findOneByUrlAndUserId($url, $userId)
{
return $this->createQueryBuilder('e')
->where('e.url = :url')->setParameter('url', $url)
->andWhere('e.user = :user_id')->setParameter('user_id', $userId)
->getQuery()
->getResult();
}
}