Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1624 from ArthurHoaro/fix/delete-redirect

Browse source 
Fix: redirect to referrer after bookmark deletion
This commit is contained in:
ArthurHoaro 2020-11-05 16:36:34 +01:00 committed by GitHub
commit 47d1581850
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
application/front/controller/admin/ShaareManageController.php
View file

@ -66,8 +66,8 @@ class ShaareManageController extends ShaarliAdminController
return $response->write('<script>self.close();</script>'); return $response->write('<script>self.close();</script>');
} }
// Don't redirect to where we were previously because the datastore has changed. // Don't redirect to permalink after deletion.
return $this->redirect($response, '/'); return $this->redirectFromReferer($request, $response, ['shaare/']);
} }
/** /**

6
tests/front/controller/admin/ShaareManageControllerTest/DeleteBookmarkTest.php
View file

@ -38,6 +38,8 @@ class DeleteBookmarkTest extends TestCase
{ {
$parameters = ['id' => '123']; $parameters = ['id' => '123'];
$this->container->environment['HTTP_REFERER'] = 'http://shaarli/subfolder/shaare/abcdef';
$request = $this->createMock(Request::class); $request = $this->createMock(Request::class);
$request $request
->method('getParam') ->method('getParam')
@ -90,6 +92,8 @@ class DeleteBookmarkTest extends TestCase
{ {
$parameters = ['id' => '123 456 789']; $parameters = ['id' => '123 456 789'];
$this->container->environment['HTTP_REFERER'] = 'http://shaarli/subfolder/?searchtags=abcdef';
$request = $this->createMock(Request::class); $request = $this->createMock(Request::class);
$request $request
->method('getParam') ->method('getParam')
@ -152,7 +156,7 @@ class DeleteBookmarkTest extends TestCase
$result = $this->controller->deleteBookmark($request, $response); $result = $this->controller->deleteBookmark($request, $response);
static::assertSame(302, $result->getStatusCode()); static::assertSame(302, $result->getStatusCode());
static::assertSame(['/subfolder/'], $result->getHeader('location')); static::assertSame(['/subfolder/?searchtags=abcdef'], $result->getHeader('location'));
} }
/** /**