partkeepr

commit 3b706e789eaf6db76843083c19b11a006056b8bf
parent 08fe7e0cee37c345e02709c5c757430e9988e0a8
Author: Timo A. Hummel <felicitus@felicitus.org>
Date:   Thu, 11 Feb 2016 22:21:55 +0100

Merge pull request #594 from partkeepr/PartKeepr-584

Catch the exception if the response is not a JSON, fixes #584
Diffstat:
M
web/setup/js/SetupTests/WebserverLogTest.js
 | 
13
+++++++++++--

1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/web/setup/js/SetupTests/WebserverLogTest.js b/web/setup/js/SetupTests/WebserverLogTest.js
@@ -8,7 +8,11 @@ Ext.define('PartKeeprSetup.WebserverLogDirectoryTest', {
     name: "PHP",
     message: "app/logs access check",
     onSuccess: function (response) {
-        var responseObj = Ext.decode(response.responseText);
+        try {
+            var responseObj = Ext.decode(response.responseText);
+        } catch (e) {
+            var responseObj = {};
+        }
 
         if (responseObj.message && responseObj.message === "readable") {
             this.success = false;
@@ -22,9 +26,14 @@ Ext.define('PartKeeprSetup.WebserverLogDirectoryTest', {
             if (this.success) {
                 this.fireEvent("complete", this);
             }
-
+        } else {
+            this.onFailure();
         }
     },
+    /**
+     * This method is being called when a 404 or 500 error is returned - which indicates that the logs directory is
+     * not readable.
+     */
     onFailure: function () {
         this.success = true;
         this.resultMessage = "app/logs not readable";