Merge pull request #109 from RnBConsulting/master
Fix editing publicly shared documents
This commit is contained in:
commit
b14a9b66de
@ -66,7 +66,7 @@ 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}',
|
'apps/richdocuments/public?shareToken={shareToken}&fileName={fileName}&requesttoken={requesttoken}&dir={dir}',
|
||||||
{
|
{
|
||||||
shareToken: $('#sharingToken').val(),
|
shareToken: $('#sharingToken').val(),
|
||||||
fileName: fileName,
|
fileName: fileName,
|
||||||
|
@ -160,7 +160,7 @@ class DocumentController extends Controller {
|
|||||||
* @return TemplateResponse
|
* @return TemplateResponse
|
||||||
* @throws \Exception
|
* @throws \Exception
|
||||||
*/
|
*/
|
||||||
public function publicPage($shareToken, $fileName) {
|
public function publicPage($shareToken, $fileName, $dir) {
|
||||||
try {
|
try {
|
||||||
$share = $this->shareManager->getShareByToken($shareToken);
|
$share = $this->shareManager->getShareByToken($shareToken);
|
||||||
// not authenticated ?
|
// not authenticated ?
|
||||||
@ -174,7 +174,7 @@ class DocumentController extends Controller {
|
|||||||
|
|
||||||
$node = $share->getNode();
|
$node = $share->getNode();
|
||||||
if($node instanceof Folder) {
|
if($node instanceof Folder) {
|
||||||
$item = $node->get($fileName);
|
$item = $node->get($dir.'/'.$fileName);
|
||||||
} else {
|
} else {
|
||||||
$item = $node;
|
$item = $node;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user