Merge remote-tracking branch 'remotes/origin/develop' into feature/of…

…fline-viewer-share # Conflicts: # CHANGELOG.md
ONLYOFFICE · Feb 9, 2024 · 47ab226 · 47ab226
2 parents 74715fb + 6e9e79f
commit 47ab226
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### Changed
 - compatible with ownCloud Web 7.0
+- list of users to protect ranges of cells
 - offline viewer for share link
 
 ## Added

diff --git a/controller/editorapicontroller.php b/controller/editorapicontroller.php
@@ -321,6 +321,7 @@ public function config($fileId, $filePath = null, $shareToken = null, $version =
 				"mode" => "strict",
 				"change" => false
 			];
+
 			$storageShare = $fileStorage->getShare();
 			if (method_exists($storageShare, "getAttributes")) {
 				$attributes = $storageShare->getAttributes();

diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php
@@ -334,13 +334,14 @@ public function createNew($name, $dir, $templateId = null) {
 	 * Get users
 	 *
 	 * @param $fileId - file identifier
+	 * @param $operationType - type of operation
 	 *
 	 * @return array
 	 *
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
 	 */
-	public function users($fileId) {
+	public function users($fileId, $operationType = null) {
 		$this->logger->debug("Search users", ["app" => $this->appName]);
 		$result = [];
 
@@ -400,17 +401,17 @@ public function users($fileId) {
 
 		foreach ($users as $user) {
 			$email = $user->getEMailAddress();
-			if ($user->getUID() != $currentUserId && !empty($email)) {
-				array_push(
-					$result,
-					[
-					"email" => $email,
-					"name" => $user->getDisplayName()
-					]
-				);
+			if ($user->getUID() != $currentUserId && (!empty($email) || $operationType === "protect")) {
+				$userElement = [
+					"name" => $user->getDisplayName(),
+					"id" => $user->getUID()
+				];
+				if (!empty($email)) {
+					$userElement["email"] = $email;
+				}
+				array_push($result, $userElement);
 			}
 		}
-
 		return $result;
 	}
 

diff --git a/js/editor.js b/js/editor.js
@@ -509,12 +509,14 @@
     };
 
     OCA.Onlyoffice.onRequestUsers = function (event) {
-        $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/users?fileId={fileId}",
+        let operationType = typeof(event.data.c) !== "undefined" ? event.data.c : null;
+        $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/users?fileId={fileId}&operationType=" + operationType,
         {
             fileId: OCA.Onlyoffice.fileId || 0
         }),
         function onSuccess(response) {
             OCA.Onlyoffice.docEditor.setUsers({
+                "c": operationType,
                 "users": response
             });
         });