oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-07-12 16:58:37 +00:00
Code Wiki Activity

Update test

Browse source 
and some cleanup
This commit is contained in:
Jeremy Benoist 2016-08-24 22:29:36 +02:00
parent b1afef30dc
commit eddda878a0
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
3 changed files with 41 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/Wallabag/CoreBundle/Controller/EntryController.php
View file

@ -465,8 +465,12 @@ class EntryController extends Controller
{
$this->checkUserAction($entry);
if ('' === $entry->getUuid() || null === $entry->getUuid()) {
$this->generateEntryUuid($entry);
if (null === $entry->getUuid()) {
$entry->generateUuid();
$em = $this->getDoctrine()->getManager();
$em->persist($entry);
$em->flush();
}
return $this->redirect($this->generateUrl('share_entry', [
@ -488,6 +492,7 @@ class EntryController extends Controller
$this->checkUserAction($entry);
$entry->cleanUuid();
$em = $this->getDoctrine()->getManager();
$em->persist($entry);
$em->flush();
@ -498,31 +503,24 @@ class EntryController extends Controller
}
/**
* Share entry content.
* Ability to view a content publicly.
*
* @param Entry $entry
*
* @Route("/share/{uuid}", requirements={"uuid" = ".+"}, name="share_entry")
* @Cache(maxage="25200", public=true)
* @Cache(maxage="25200", smaxage="25200", public=true)
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function shareEntryAction(Entry $entry)
{
if (!$this->get('craue_config')->get('share_public')) {
throw $this->createAccessDeniedException('Sharing an entry is disabled for this user.');
}
return $this->render(
'@WallabagCore/themes/share.html.twig',
array('entry' => $entry)
['entry' => $entry]
);
}
/**
* @param Entry $entry
*/
private function generateEntryUuid(Entry $entry)
{
$entry->generateUuid();
$em = $this->getDoctrine()->getManager();
$em->persist($entry);
$em->flush();
}
}