DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use fileId instead of dir

Browse Source 
(cherry picked from commit e9f9711421ed1eba9cdb3b787b1a49eaed7373d1)
This commit is contained in:
Pranav Kant 2017-07-24 14:19:53 +05:30 committed by Andras Timar
parent 909053b299
commit 3eba8b7644
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/viewer/viewer.js
View File

@ -66,11 +66,11 @@ var odfViewer = {
var viewer; var viewer;
if($('#isPublic').val() === '1') { if($('#isPublic').val() === '1') {
viewer = OC.generateUrl( viewer = OC.generateUrl(
'apps/richdocuments/public?shareToken={shareToken}&fileName={fileName}&requesttoken={requesttoken}&dir={dir}', 'apps/richdocuments/public?shareToken={shareToken}&fileName={fileName}&requesttoken={requesttoken}&fileId={fileId}',
{ {
shareToken: $('#sharingToken').val(), shareToken: $('#sharingToken').val(),
fileName: fileName, fileName: fileName,
dir: fileDir, fileId: fileId,
requesttoken: OC.requestToken requesttoken: OC.requestToken
} }
); );

4
lib/Controller/DocumentController.php
View File

@ -142,7 +142,7 @@ class DocumentController extends Controller {
* @return TemplateResponse * @return TemplateResponse
* @throws \Exception * @throws \Exception
*/ */
public function publicPage($shareToken, $fileName, $dir) { public function publicPage($shareToken, $fileName, $fileId) {
try { try {
$share = $this->shareManager->getShareByToken($shareToken); $share = $this->shareManager->getShareByToken($shareToken);
// not authenticated ? // not authenticated ?
@ -156,7 +156,7 @@ class DocumentController extends Controller {
$node = $share->getNode(); $node = $share->getNode();
if($node instanceof Folder) { if($node instanceof Folder) {
$item = $node->get($dir.'/'.$fileName); $item = $node->getById($fileId)[0];
} else { } else {
$item = $node; $item = $node;
} }