From faf48e42b7a9bf208bd2e16baa0a9cc4c602dce3 Mon Sep 17 00:00:00 2001 From: Vincent Chan Date: Mon, 1 Feb 2016 18:14:10 +0100 Subject: Move data protection check to javascript fixes #20199 --- settings/js/admin.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'settings/js') diff --git a/settings/js/admin.js b/settings/js/admin.js index 6660bfe9b48..90b1de68370 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -171,9 +171,10 @@ $(document).ready(function(){ OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav/', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === 'true'), OC.SetupChecks.checkWellKnownUrl('/.well-known/carddav/', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === 'true'), OC.SetupChecks.checkSetup(), - OC.SetupChecks.checkGeneric() - ).then(function(check1, check2, check3, check4, check5) { - var messages = [].concat(check1, check2, check3, check4, check5); + OC.SetupChecks.checkGeneric(), + OC.SetupChecks.checkDataProtected() + ).then(function(check1, check2, check3, check4, check5, check6) { + var messages = [].concat(check1, check2, check3, check4, check5, check6); var $el = $('#postsetupchecks'); $el.find('.loading').addClass('hidden'); -- cgit v1.2.3