oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-01 17:38:38 +00:00
Code Wiki Activity

Renamed uuid to uid

Browse source
This commit is contained in:
Nicolas Lœuillet 2016-12-29 10:09:44 +01:00
parent 89cd670abf
commit 7239082a5e
No known key found for this signature in database
GPG key ID: BDC1EFB5CA0145F2
5 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -539,8 +539,8 @@ class EntryController extends Controller
{
$this->checkUserAction($entry);
if (null === $entry->getUuid()) {
$entry->generateUuid();
if (null === $entry->getUid()) {
$entry->generateUid();
$em = $this->getDoctrine()->getManager();
$em->persist($entry);
@ -548,7 +548,7 @@ class EntryController extends Controller
}
return $this->redirect($this->generateUrl('share_entry', [
'uuid' => $entry->getUuid(),
'uid' => $entry->getUid(),
]));
}
@ -565,7 +565,7 @@ class EntryController extends Controller
{
$this->checkUserAction($entry);
$entry->cleanUuid();
$entry->cleanUid();
$em = $this->getDoctrine()->getManager();
$em->persist($entry);
@ -581,7 +581,7 @@ class EntryController extends Controller
*
* @param Entry $entry
*
* @Route("/share/{uuid}", requirements={"uuid" = ".+"}, name="share_entry")
* @Route("/share/{uid}", requirements={"uid" = ".+"}, name="share_entry")
* @Cache(maxage="25200", smaxage="25200", public=true)
*
* @return \Symfony\Component\HttpFoundation\Response