Merge pull request #122 from ONLYOFFICE/hotfix/convert-action

Hotfix/convert action
ONLYOFFICE · Oct 18, 2021 · 5cbeae9 · 5cbeae9
2 parents ba9f59d + de426f4
commit 5cbeae9
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+# 5.0.1
+## Fixed
+- error on the "Document Details" page when the "Convert with ONLYOFFICE" button is displayed [#121](https://github.com/ONLYOFFICE/onlyoffice-alfresco/issues/121)
+
 # 5.0.0
 ## Added
 - connection to the demo server

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.onlyoffice.alfresco</groupId>
     <artifactId>onlyoffice-integration</artifactId>
-    <version>5.0.0</version>
+    <version>5.0.1</version>
     <name>ONLYOFFICE Alfresco Integration</name>
     <description>This Module integrates Alfresco Share with ONLYOFFICE</description>
     <packaging>pom</packaging>

diff --git a/repo/pom.xml b/repo/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.onlyoffice.alfresco</groupId>
         <artifactId>onlyoffice-integration</artifactId>
-        <version>5.0.0</version>
+        <version>5.0.1</version>
     </parent>
 
     <properties>

diff --git a/share/pom.xml b/share/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.onlyoffice.alfresco</groupId>
         <artifactId>onlyoffice-integration</artifactId>
-        <version>5.0.0</version>
+        <version>5.0.1</version>
     </parent>
 
     <properties>

diff --git a/share/src/main/java/com/onlyoffice/web/evaluator/IsConvertPermission.java b/share/src/main/java/com/onlyoffice/web/evaluator/IsConvertPermission.java
@@ -19,38 +19,34 @@ public void setOnlyofficeSettings(OnlyofficeSettingsQuery onlyofficeSettings) {
 
     @Override
     public boolean evaluate(JSONObject jsonObject) {
-        try
-        {
+        try {
             if (onlyofficeSettings.getConvertOriginal()) {
                 JSONObject node = (JSONObject)jsonObject.get("node");
-                if (node == null)
-                {
-                    return false;
-                }
-                else
-                {
+                if (node != null && node.containsKey("permissions")) {
                     JSONObject perm = (JSONObject)node.get("permissions");
-                    JSONObject user = (JSONObject)perm.get("user");
-                    return (boolean)user.getOrDefault("Write", false);
+                    if (perm != null && perm.containsKey("user")) {
+                        JSONObject user = (JSONObject)perm.get("user");
+                        if (user != null && (boolean)user.getOrDefault("Write", false)) {
+                            return true;
+                        }
+                    }
                 }
             } else {
                 JSONObject parent = (JSONObject)jsonObject.get("parent");
-                if (parent == null)
-                {
-                    return false;
-                }
-                else
-                {
+                if (parent != null && parent.containsKey("permissions")) {
                     JSONObject perm = (JSONObject)parent.get("permissions");
-                    JSONObject user = (JSONObject)perm.get("user");
-                    return (boolean)user.getOrDefault("CreateChildren", false);
+                    if (perm != null && perm.containsKey("user")) {
+                        JSONObject user = (JSONObject)perm.get("user");
+                        if (user != null && (boolean)user.getOrDefault("CreateChildren", false)) {
+                            return true;
+                        }
+                    }
                 }
             }
-        }
-        catch (Exception err)
-        {
-            throw new AlfrescoRuntimeException("Failed to run action evaluator: " + err.getMessage());
+
+            return false;
+        } catch (Exception err) {
+            throw new AlfrescoRuntimeException("Failed to run action evaluator", err);
         }
     }
-
 }
diff --git a/share/src/main/java/com/onlyoffice/web/evaluator/IsEditableMimetype.java b/share/src/main/java/com/onlyoffice/web/evaluator/IsEditableMimetype.java
@@ -48,7 +48,7 @@ public boolean evaluate(JSONObject jsonObject)
         }
         catch (Exception err)
         {
-            throw new AlfrescoRuntimeException("Failed to run action evaluator: " + err.getMessage());
+            throw new AlfrescoRuntimeException("Failed to run action evaluator", err);
         }
 
         return true;

diff --git a/share/src/main/java/com/onlyoffice/web/evaluator/IsOnlyEditEvaluator.java b/share/src/main/java/com/onlyoffice/web/evaluator/IsOnlyEditEvaluator.java
@@ -26,7 +26,7 @@ public boolean evaluate(JSONObject jsonObject) {
 
             return false;
         } catch (Exception err) {
-            throw new AlfrescoRuntimeException("Failed to run action evaluator: " + err.getMessage());
+            throw new AlfrescoRuntimeException("Failed to run action evaluator", err);
         }
     }
 

diff --git a/share/src/main/java/com/onlyoffice/web/evaluator/IsViewMimetype.java b/share/src/main/java/com/onlyoffice/web/evaluator/IsViewMimetype.java
@@ -58,7 +58,7 @@ public boolean evaluate(JSONObject jsonObject) {
         }
         catch (Exception err)
         {
-            throw new AlfrescoRuntimeException("Failed to run action evaluator: " + err.getMessage());
+            throw new AlfrescoRuntimeException("Failed to run action evaluator", err);
         }
 
         return true;

diff --git a/share/src/main/java/com/onlyoffice/web/evaluator/IsWritePermission.java b/share/src/main/java/com/onlyoffice/web/evaluator/IsWritePermission.java
@@ -13,24 +13,21 @@ public class IsWritePermission extends BaseEvaluator {
 
     @Override
     public boolean evaluate(JSONObject jsonObject) {
-        try
-        {
+        try {
             JSONObject node = (JSONObject)jsonObject.get("node");
-            if (node == null)
-            {
-                return false;
-            }
-            else
-            {
+            if (node != null && node.containsKey("permissions")){
                 JSONObject perm = (JSONObject)node.get("permissions");
-                JSONObject user = (JSONObject)perm.get("user");
-                return (boolean)user.getOrDefault("Write", false);
+                if (perm != null && perm.containsKey("user")) {
+                    JSONObject user = (JSONObject) perm.get("user");
+                    if (user != null && (boolean) user.getOrDefault("Write", false)) {
+                        return true;
+                    }
+                }
             }
-        }
-        catch (Exception err)
-        {
-            throw new AlfrescoRuntimeException("Failed to run action evaluator: " + err.getMessage());
+
+            return false;
+        } catch (Exception err) {
+            throw new AlfrescoRuntimeException("Failed to run action evaluator", err);
         }
     }
-
 }