devol/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-15 01:48:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

TagController: ignore ActionMarkAsRead when removing tag from entry

Browse Source 
Fixes #2835

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
This commit is contained in:
Kevin Decherf 2017-05-21 16:35:06 +02:00
parent 2150576d86
commit 5dbf3f2326
4 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Wallabag/CoreBundle/Controller/TagController.php
View File

@ -70,7 +70,7 @@ class TagController extends Controller
$em->flush();
}
$redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'));
$redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'), '', true);
return $this->redirect($redirectUrl);
}

10
src/Wallabag/CoreBundle/Helper/Redirect.php
View File

@ -21,12 +21,13 @@ class Redirect
}
/**
* @param string $url URL to redirect
* @param string $fallback Fallback URL if $url is null
* @param string $url URL to redirect
* @param string $fallback Fallback URL if $url is null
* @param bool $ignoreActionMarkAsRead Ignore configured action when mark as read
*
* @return string
*/
public function to($url, $fallback = '')
public function to($url, $fallback = '', $ignoreActionMarkAsRead = false)
{
$user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null;
@ -34,7 +35,8 @@ class Redirect
return $url;
}
if (Config::REDIRECT_TO_HOMEPAGE === $user->getConfig()->getActionMarkAsRead()) {
if (!$ignoreActionMarkAsRead &&
Config::REDIRECT_TO_HOMEPAGE === $user->getConfig()->getActionMarkAsRead()) {
return $this->router->generate('homepage');
}

4
tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
View File

@ -126,9 +126,13 @@ class TagControllerTest extends WallabagCoreTestCase
->getRepository('WallabagCoreBundle:Tag')
->findOneByEntryAndTagLabel($entry, $this->tagName);
// We make a first request to set an history and test redirection after tag deletion
$client->request('GET', '/view/'.$entry->getId());
$entryUri = $client->getRequest()->getUri();
$client->request('GET', '/remove-tag/'.$entry->getId().'/'.$tag->getId());
$this->assertEquals(302, $client->getResponse()->getStatusCode());
$this->assertEquals($entryUri, $client->getResponse()->getTargetUrl());
$this->assertNotContains($this->tagName, $entry->getTags());

18
tests/Wallabag/CoreBundle/Helper/RedirectTest.php
View File

@ -89,4 +89,22 @@ class RedirectTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($this->routerMock->generate('homepage'), $redirectUrl);
}
public function testUserForRedirectWithIgnoreActionMarkAsRead()
{
$this->token->getUser()->getConfig()->setActionMarkAsRead(Config::REDIRECT_TO_HOMEPAGE);
$redirectUrl = $this->redirect->to('/unread/list', '', true);
$this->assertEquals('/unread/list', $redirectUrl);
}
public function testUserForRedirectNullWithFallbackWithIgnoreActionMarkAsRead()
{
$this->token->getUser()->getConfig()->setActionMarkAsRead(Config::REDIRECT_TO_HOMEPAGE);
$redirectUrl = $this->redirect->to(null, 'fallback', true);
$this->assertEquals('fallback', $redirectUrl);
}
}