summaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-06-24 09:47:55 +0200
committerGitHub <noreply@github.com>2016-06-24 09:47:55 +0200
commitdc78d26f2abec23e68b5dd3011f698d7b9f6e6a3 (patch)
tree93b2bf5ec33fcd1410e4011fb842b95fee4f7c99 /core/js
parent29068d3845065c3ca873513f3be6d27d886c9874 (diff)
parent97f1813695a183df786b4e3bf4fe27691405bf44 (diff)
downloadnextcloud-server-dc78d26f2abec23e68b5dd3011f698d7b9f6e6a3.tar.gz
nextcloud-server-dc78d26f2abec23e68b5dd3011f698d7b9f6e6a3.zip
Merge pull request #25239 from owncloud/setupchecks-preventreload
Don't reload page in case of auth errors during setup checks
Diffstat (limited to 'core/js')
-rw-r--r--core/js/setupchecks.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index f987c9f04e6..280c8d08c99 100644
--- a/core/js/setupchecks.js
+++ b/core/js/setupchecks.js
@@ -76,7 +76,8 @@
$.ajax({
type: 'PROPFIND',
url: url,
- complete: afterCall
+ complete: afterCall,
+ allowAuthErrors: true
});
return deferred.promise();
},
@@ -209,7 +210,8 @@
$.ajax({
type: 'GET',
url: OC.linkTo('', oc_dataURL+'/htaccesstest.txt?t=' + (new Date()).getTime()),
- complete: afterCall
+ complete: afterCall,
+ allowAuthErrors: true
});
return deferred.promise();
},