Merge pull request 'feature/open-pdf-on-edit-by-default' from feature…

…/open-pdf-on-edit-by-default into develop

Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/onlyoffice-nextcloud/pulls/10

CHANGELOG.md

@@ -1,12 +1,13 @@
 # Change Log
 
+##
 ## Added
 - default empty templates
 - Finnish, Hebrew, Norwegian, Slovenian empty file templates
 
 ## Changed
-- update en-US empty templates
 - demo server address changed
+- editing pdf by default
 
 ## 9.4.0
 ## Added

lib/Controller/EditorApiController.php

@@ -238,14 +238,13 @@ public function __construct(
      * @param string $guestName - nickname not logged user
      * @param bool $template - file is template
      * @param string $anchor - anchor for file content
-     * @param bool $forceEdit - open editing
      *
      * @return JSONResponse
      *
      * @NoAdminRequired
      * @PublicPage
      */
-    public function config($fileId, $filePath = null, $shareToken = null, $directToken = null, $inframe = false, $inviewer = false, $desktop = false, $guestName = null, $template = false, $anchor = null, $forceEdit = false) {
+    public function config($fileId, $filePath = null, $shareToken = null, $directToken = null, $inframe = false, $inviewer = false, $desktop = false, $guestName = null, $template = false, $anchor = null) {
 
         if (!empty($directToken)) {
             list($directData, $error) = $this->crypt->readHash($directToken);
@@ -409,7 +408,7 @@ public function config($fileId, $filePath = null, $shareToken = null, $directTok
                     && !$isTempLock
                     && (empty($shareToken) || ($share->getPermissions() & Constants::PERMISSION_UPDATE) === Constants::PERMISSION_UPDATE)
                     && !$restrictedEditing;
-        $params["document"]["permissions"]["edit"] = $editable && ($forceEdit || !$canFillForms);
+        $params["document"]["permissions"]["edit"] = $editable;
         if (($editable || $restrictedEditing) && ($canEdit || $canFillForms)) {
             $ownerId = null;
             $owner = $file->getOwner();

lib/Controller/EditorController.php

@@ -1283,7 +1283,6 @@ public function download($fileId, $toExtension = null, $template = false) {
      * @param string $filePath - file path
      * @param string $shareToken - access token
      * @param bool $inframe - open in frame
-     * @param bool $forceEdit - open editing
      * @param bool $inviewer - open in viewer
      * @param bool $template - file is template
      * @param string $anchor - anchor for file content
@@ -1293,7 +1292,7 @@ public function download($fileId, $toExtension = null, $template = false) {
      * @NoAdminRequired
      * @NoCSRFRequired
      */
-    public function index($fileId, $filePath = null, $shareToken = null, $inframe = false, $forceEdit = false, $inviewer = false, $template = false, $anchor = null) {
+    public function index($fileId, $filePath = null, $shareToken = null, $inframe = false, $inviewer = false, $template = false, $anchor = null) {
         $this->logger->debug("Open: $fileId $filePath ", ["app" => $this->appName]);
 
         $isLoggedIn = $this->userSession->isLoggedIn();
@@ -1332,8 +1331,7 @@ public function index($fileId, $filePath = null, $shareToken = null, $inframe =
             "isTemplate" => $template,
             "inframe" => false,
             "inviewer" => $inviewer === true,
-            "anchor" => $anchor,
-            "forceEdit" => $forceEdit
+            "anchor" => $anchor
         ];
 
         $response = null;
@@ -1374,16 +1372,15 @@ public function index($fileId, $filePath = null, $shareToken = null, $inframe =
      * @param integer $fileId - file identifier
      * @param string $shareToken - access token
      * @param bool $inframe - open in frame
-     * @param bool $forceEdit - open editing
      *
      * @return TemplateResponse
      *
      * @NoAdminRequired
      * @NoCSRFRequired
      * @PublicPage
      */
-    public function publicPage($fileId, $shareToken, $inframe = false, $forceEdit = false) {
-        return $this->index($fileId, null, $shareToken, $inframe, $forceEdit);
+    public function publicPage($fileId, $shareToken, $inframe = false) {
+        return $this->index($fileId, null, $shareToken, $inframe);
     }
 
     /**

lib/DirectEditor.php

@@ -250,8 +250,7 @@ public function open(IToken $token): Response {
                 "isTemplate" => false,
                 "inframe" => false,
                 "inviewer" => false,
-                "anchor" => null,
-                "forceEdit" => false
+                "anchor" => null
             ];
 
             $response = new TemplateResponse($this->appName, "editor", $params, "base");

src/editor.js

@@ -53,7 +53,6 @@
 		OCA.Onlyoffice.inviewer = !!$('#iframeEditor').data('inviewer')
 		OCA.Onlyoffice.filePath = $('#iframeEditor').data('path')
 		OCA.Onlyoffice.anchor = $('#iframeEditor').attr('data-anchor')
-		OCA.Onlyoffice.forceEdit = $('#iframeEditor').attr('data-forceEdit')
 		const guestName = localStorage.getItem('nick')
 		OCA.Onlyoffice.currentWindow = window
 		OCA.Onlyoffice.currentUser = OC.getCurrentUser()
@@ -105,9 +104,6 @@
 		if (OCA.Onlyoffice.anchor) {
 			params.push('anchor=' + encodeURIComponent(OCA.Onlyoffice.anchor))
 		}
-		if (OCA.Onlyoffice.forceEdit) {
-			params.push('forceEdit=true')
-		}
 
 		if (OCA.Onlyoffice.inframe || directToken) {
 			params.push('inframe=true')
@@ -217,12 +213,6 @@
 						config.events.onRequestSharingSettings = OCA.Onlyoffice.onRequestSharingSettings
 					}
 
-					if (!config.document.permissions.edit
-						&& config.document.permissions.fillForms
-						&& config.canEdit) {
-						config.events.onRequestEditRights = OCA.Onlyoffice.onRequestEditRights
-					}
-
 					OCA.Onlyoffice.docEditor = new DocsAPI.DocEditor('iframeEditor', config)
 
 					if (OCA.Onlyoffice.directEditor) {
@@ -249,17 +239,6 @@
 		})
 	}
 
-	OCA.Onlyoffice.onRequestEditRights = function() {
-		if (OCA.Onlyoffice.inframe) {
-			window.parent.postMessage({
-				method: 'onRequestEditRights',
-			},
-			'*')
-			return
-		}
-		location.href += '&forceEdit=true'
-	}
-
 	OCA.Onlyoffice.onRequestHistory = function(version) {
 		$.get(OC.generateUrl('apps/' + OCA.Onlyoffice.AppName + '/ajax/history?fileId={fileId}',
 			{

src/listener.js

@@ -128,10 +128,6 @@
 		}
 	}
 
-	OCA.Onlyoffice.onRequestEditRights = function() {
-		$(OCA.Onlyoffice.frameSelector).attr('src', $(OCA.Onlyoffice.frameSelector).attr('src') + '&forceEdit=true')
-	}
-
 	window.addEventListener('message', function(event) {
 		if (!$(OCA.Onlyoffice.frameSelector).length
 			|| $(OCA.Onlyoffice.frameSelector)[0].contentWindow !== event.source
@@ -176,8 +172,6 @@
 		case 'onShowMessage':
 			OCA.Onlyoffice.onShowMessage(event.data.param)
 			break
-		case 'onRequestEditRights':
-			OCA.Onlyoffice.onRequestEditRights()
 		}
 	}, false)
 

src/main.js

@@ -124,9 +124,7 @@ import NewPdfSvg from '!!raw-loader!../img/new-pdf.svg';
 
 				if (open) {
 					const fileName = response.name
-					const extension = OCA.Onlyoffice.getFileExtension(fileName)
-					const forceEdit = OCA.Onlyoffice.setting.formats[extension].fillForms
-					OCA.Onlyoffice.OpenEditor(response.id, dir, fileName, winEditor, forceEdit)
+					OCA.Onlyoffice.OpenEditor(response.id, dir, fileName, winEditor)
 
 					OCA.Onlyoffice.context = {
 						fileName: response.name,
@@ -139,7 +137,7 @@ import NewPdfSvg from '!!raw-loader!../img/new-pdf.svg';
 		)
 	}
 
-	OCA.Onlyoffice.OpenEditor = function(fileId, fileDir, fileName, winEditor, forceEdit) {
+	OCA.Onlyoffice.OpenEditor = function(fileId, fileDir, fileName, winEditor) {
 		let filePath = ''
 		if (fileName) {
 			filePath = fileDir.replace(/\/$/, '') + '/' + fileName
@@ -158,10 +156,6 @@ import NewPdfSvg from '!!raw-loader!../img/new-pdf.svg';
 				})
 		}
 
-		if (forceEdit) {
-			url += '&forceEdit=true'
-		}
-
 		if (winEditor && winEditor.location) {
 			winEditor.location.href = url
 		} else if (!OCA.Onlyoffice.setting.sameTab || OCA.Onlyoffice.mobile || OCA.Onlyoffice.Desktop) {

templates/editor.php

@@ -48,8 +48,7 @@ class="onlyoffice-inviewer"
         data-template="<?php p($_["isTemplate"]) ?>"
         data-anchor="<?php p($_["anchor"]) ?>"
         data-inframe="<?php p($_["inframe"]) ?>"
-        data-inviewer="<?php p($_["inviewer"]) ?>"
-        data-forceedit="<?php p($_["forceEdit"]) ?>"></div>
+        data-inviewer="<?php p($_["inviewer"]) ?>"></div>
 
     <?php if (!empty($_["documentServerUrl"])) { ?>
         <script nonce="<?php p(\OC::$server->get(\OC\Security\CSP\ContentSecurityPolicyNonceManager::class)->getNonce()) ?>"