diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-10-09 14:47:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-09 14:47:14 +0200 |
| commit | dcf5a57d01eb8111127867c550d2614842e5a30e (patch) | |
| tree | db213177167930f6e00c234aec893d4692a04016 /apps/files_external | |
| parent | 7e7a14cc9acc697d767cb078f2a30a408f0e8cf3 (diff) | |
| parent | 9af69ca2a5ed74acefdaedad6d189bdfd9e61e0e (diff) | |
| download | nextcloud-server-dcf5a57d01eb8111127867c550d2614842e5a30e.tar.gz nextcloud-server-dcf5a57d01eb8111127867c550d2614842e5a30e.zip | |
Merge pull request #11691 from nextcloud/refactor/fix-usage-deprecated-oc-webroot
Fix usage of deprecated OC.webroot
Diffstat (limited to 'apps/files_external')
| -rw-r--r-- | apps/files_external/js/statusmanager.js | 2 | ||||
| -rw-r--r-- | apps/files_external/tests/js/mountsfilelistSpec.js | 4 | ||||
| -rw-r--r-- | apps/files_external/tests/js/settingsSpec.js | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/apps/files_external/js/statusmanager.js b/apps/files_external/js/statusmanager.js index 563f8a76493..a65988353af 100644 --- a/apps/files_external/js/statusmanager.js +++ b/apps/files_external/js/statusmanager.js @@ -79,7 +79,7 @@ OCA.External.StatusManager = { } else { defObj = $.ajax({ type: 'GET', - url: OC.webroot + '/index.php/apps/files_external/' + ((mountData.type === 'personal') ? 'userstorages' : 'userglobalstorages') + '/' + mountData.id, + url: OC.getRootPath() + '/index.php/apps/files_external/' + ((mountData.type === 'personal') ? 'userstorages' : 'userglobalstorages') + '/' + mountData.id, data: {'testOnly' : false}, success: function (response) { if (response && response.status === 0) { diff --git a/apps/files_external/tests/js/mountsfilelistSpec.js b/apps/files_external/tests/js/mountsfilelistSpec.js index c7ea819d2fe..feea68cf346 100644 --- a/apps/files_external/tests/js/mountsfilelistSpec.js +++ b/apps/files_external/tests/js/mountsfilelistSpec.js @@ -123,7 +123,7 @@ describe('OCA.External.FileList tests', function() { expect($tr.attr('data-size')).not.toBeDefined(); expect($tr.attr('data-permissions')).toEqual('1'); // read only expect($tr.find('a.name').attr('href')).toEqual( - OC.webroot + + OC.getRootPath() + '/index.php/apps/files' + '?dir=/another%20mount%20points/sftp%20mount' ); @@ -139,7 +139,7 @@ describe('OCA.External.FileList tests', function() { expect($tr.attr('data-size')).not.toBeDefined(); expect($tr.attr('data-permissions')).toEqual('9'); // read and delete expect($tr.find('a.name').attr('href')).toEqual( - OC.webroot + + OC.getRootPath() + '/index.php/apps/files' + '?dir=/mount%20points/smb%20mount' ); diff --git a/apps/files_external/tests/js/settingsSpec.js b/apps/files_external/tests/js/settingsSpec.js index 78136fc6bf6..57ad4550993 100644 --- a/apps/files_external/tests/js/settingsSpec.js +++ b/apps/files_external/tests/js/settingsSpec.js @@ -215,7 +215,7 @@ describe('OCA.External.Settings tests', function() { expect(fakeServer.requests.length).toEqual(1); var request = fakeServer.requests[0]; - expect(request.url).toEqual(OC.webroot + '/index.php/apps/files_external/globalstorages'); + expect(request.url).toEqual(OC.getRootPath() + '/index.php/apps/files_external/globalstorages'); expect(JSON.parse(request.requestBody)).toEqual({ backend: '\\OC\\TestBackend', authMechanism: 'mechanism1', |