pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Don't redirect to the content page after deletion

Browse Source 
Fix #1512

We generate the url of the removed content and compare it to the referer url. If they matche, we redirect user to the homepage otherwise to the referer url.
This commit is contained in:
Jeremy Benoist
2015-12-27 21:28:48 +01:00
parent 71eff67f8b
commit 2863bf2ab5
2 changed files with 58 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Wallabag/CoreBundle/Controller/EntryController.php
View File

@ -5,6 +5,7 @@ namespace Wallabag\CoreBundle\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Form\Type\NewEntryType;
use Wallabag\CoreBundle\Form\Type\EditEntryType;
@ -316,7 +317,7 @@ class EntryController extends Controller
}
/**
* Deletes entry and redirect to the homepage.
* Deletes entry and redirect to the homepage or the last viewed page.
*
* @param Entry $entry
*
@ -328,6 +329,14 @@ class EntryController extends Controller
{
$this->checkUserAction($entry);
// generates the view url for this entry to check for redirection later
// to avoid redirecting to the deleted entry. Ugh.
$url = $this->generateUrl(
'view',
array('id' => $entry->getId()),
UrlGeneratorInterface::ABSOLUTE_URL
);
$em = $this->getDoctrine()->getManager();
$em->remove($entry);
$em->flush();
@ -337,7 +346,8 @@ class EntryController extends Controller
'Entry deleted'
);
return $this->redirect($request->headers->get('referer'));
// don't redirect user to the deleted entry
return $this->redirect($url !== $request->headers->get('referer') ?: $this->generateUrl('homepage'));
}
/**