mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

When requesting a permalink to an invalid file redirect 

We need to do the redirect to update address bar.
This commit is contained in:
Roeland Jago Douma 2016-08-19 10:10:19 +02:00
parent 54f79a28f6
commit cc9b36131c
No known key found for this signature in database
GPG Key ID: 1E152838F164D13B
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/files/lib/Controller/ViewController.php
View File

@ -143,15 +143,14 @@ class ViewController extends Controller {
* @param string $dir
* @param string $view
* @param string $fileid
* @return TemplateResponse
* @return TemplateResponse|RedirectResponse
*/
public function index($dir = '', $view = '', $fileid = null) {
$fileNotFound = false;
public function index($dir = '', $view = '', $fileid = null, $fileNotFound = false) {
if ($fileid !== null) {
try {
return $this->showFile($fileid);
} catch (NotFoundException $e) {
$fileNotFound = true;
return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', ['fileNotFound' => true]));
}
}

10
apps/files/tests/Controller/ViewControllerTest.php
View File

@ -348,10 +348,14 @@ class ViewControllerTest extends TestCase {
->with(123)
->will($this->returnValue([]));
$this->urlGenerator->expects($this->once())
->method('linkToRoute')
->with('files.view.index', ['fileNotFound' => true])
->willReturn('redirect.url');
$response = $this->viewController->index('MyDir', 'MyView', '123');
$this->assertInstanceOf('OCP\AppFramework\Http\TemplateResponse', $response);
$params = $response->getParams();
$this->assertEquals(1, $params['fileNotFound']);
$this->assertInstanceOf('OCP\AppFramework\Http\RedirectResponse', $response);
$this->assertEquals('redirect.url', $response->getRedirectURL());
}
public function testShowFileRouteWithTrashedFile() {